[mb-commits] r9733 - in mb_server/branches/terminology: admin admin/cleanup cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/bare htdocs/edit/discid htdocs/show/cdtoc
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 13:13:47 UTC 2008
Author: luks
Date: 2008-03-09 13:13:46 +0000 (Sun, 09 Mar 2008)
New Revision: 9733
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm
Modified:
mb_server/branches/terminology/admin/cleanup/FixLength.pl
mb_server/branches/terminology/admin/startup.pl.default
mb_server/branches/terminology/cgi-bin/FreeDB.pm
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/CDTOC.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
mb_server/branches/terminology/cgi-bin/QuerySupport.pm
mb_server/branches/terminology/htdocs/bare/cdlookup.html
mb_server/branches/terminology/htdocs/bare/xget.html
mb_server/branches/terminology/htdocs/edit/discid/move.html
mb_server/branches/terminology/htdocs/edit/discid/remove.html
mb_server/branches/terminology/htdocs/show/cdtoc/index.html
Log:
Rename MusicBrainz::Server::AlbumCDTOC to MusicBrainz::Server::ReleaseCDTOC (+ one constructor from MusicBrainz::Server::ReleaseEvent)
Modified: mb_server/branches/terminology/admin/cleanup/FixLength.pl
===================================================================
--- mb_server/branches/terminology/admin/cleanup/FixLength.pl 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/admin/cleanup/FixLength.pl 2008-03-09 13:13:46 UTC (rev 9733)
@@ -86,8 +86,8 @@
no warnings 'exiting';
eval {
- require MusicBrainz::Server::AlbumCDTOC;
- my $tocs = MusicBrainz::Server::AlbumCDTOC->newFromAlbum($mb->{DBH}, $id);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ my $tocs = MusicBrainz::Server::ReleaseCDTOC->newFromRelease($mb->{DBH}, $id);
$_ = $_->GetCDTOC for @$tocs;
if ($debug)
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 13:13:46 UTC (rev 9733)
@@ -60,7 +60,7 @@
require MusicBrainz::Server::Annotation;
require MusicBrainz::Server::Attribute;
require MusicBrainz::Server::AutomodElection;
-require MusicBrainz::Server::AlbumCDTOC;
+require MusicBrainz::Server::ReleaseCDTOC;
require MusicBrainz::Server::Cache;
require MusicBrainz::Server::CDTOC;
require MusicBrainz::Server::Country;
Modified: mb_server/branches/terminology/cgi-bin/FreeDB.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -49,7 +49,7 @@
}, ref($class) || $class;
}
-# Public. Called from MusicBrainz::Server::AlbumCDTOC->GenerateAlbumFromDiscid;
+# Public. Called from MusicBrainz::Server::ReleaseCDTOC->GenerateAlbumFromDiscid;
sub Lookup
{
my ($this, $Discid, $toc) = @_;
@@ -331,7 +331,7 @@
return \%info;
}
-# Public. Called by MusicBrainz::Server::AlbumCDTOC->GenerateAlbumFromDiscid
+# Public. Called by MusicBrainz::Server::ReleaseCDTOC->GenerateAlbumFromDiscid
sub InsertForModeration
{
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -415,8 +415,8 @@
# If a valid cdindexid and toc was supplied, then insert that now
if (exists $info->{cdindexid} && exists $info->{toc})
{
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->Insert($this->{DBH}, $albumid, $info->{toc});
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->Insert($this->{DBH}, $albumid, $info->{toc});
$info->{cdindexid_insertid} = $info->{cdindexid};
}
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/CDTOC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/CDTOC.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/CDTOC.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -168,12 +168,12 @@
$rows;
}
-sub GetAlbumCDTOCs
+sub GetReleaseCDTOCs
{
my $self = shift;
$self = $self->new(shift) if not ref $self;
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->newFromCDTOC($self->{DBH}, $self, @_);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->newFromCDTOC($self->{DBH}, $self, @_);
}
################################################################################
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -158,12 +158,12 @@
}
elsif ($cdid)
{
- require MusicBrainz::Server::AlbumCDTOC;
+ require MusicBrainz::Server::ReleaseCDTOC;
$is_coll = 1;
$inc = INC_ARTIST | INC_COUNTS | INC_RELEASEINFO;
- my $cd = MusicBrainz::Server::AlbumCDTOC->new($mb->{DBH});
+ my $cd = MusicBrainz::Server::ReleaseCDTOC->new($mb->{DBH});
my $albumids = $cd->GetAlbumIDsFromDiscID($cdid);
if (scalar(@$albumids))
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -40,11 +40,11 @@
my $al = $opts{'album'} or die; # object
my $toc = $opts{'toc'} or die; # string
- require MusicBrainz::Server::AlbumCDTOC;
+ require MusicBrainz::Server::ReleaseCDTOC;
my $added;
my $tocid;
- my $rowid = MusicBrainz::Server::AlbumCDTOC->Insert(
+ my $rowid = MusicBrainz::Server::ReleaseCDTOC->Insert(
$self->{DBH}, $al, $toc,
added => \$added,
tocid => \$tocid,
@@ -111,9 +111,9 @@
{
my $self = shift;
- require MusicBrainz::Server::AlbumCDTOC;
+ require MusicBrainz::Server::ReleaseCDTOC;
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromId($self->{DBH}, $self->GetRowId);
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId);
if (not $alcdtoc)
{
$self->InsertNote(MODBOT_MODERATOR, "This disc ID has already been removed");
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -83,8 +83,8 @@
die $self;
}
- require MusicBrainz::Server::AlbumCDTOC;
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromAlbumAndCDTOC($self->{DBH}, $oldal, $cdtoc->GetId);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromReleaseAndCDTOC($self->{DBH}, $oldal, $cdtoc->GetId);
if (not $alcdtoc)
{
$self->SetError("Old release / CD TOC not found");
@@ -165,8 +165,8 @@
my $new = $self->{'new_unpacked'};
# Check that the album_cdtoc row still exists
- require MusicBrainz::Server::AlbumCDTOC;
- my $album_cdtoc = MusicBrainz::Server::AlbumCDTOC->newFromId($self->{DBH}, $self->GetRowId)
+ require MusicBrainz::Server::ReleaseCDTOC;
+ my $album_cdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId)
or do {
$self->InsertNote(MODBOT_MODERATOR, "This disc ID has been deleted");
$self->SetStatus(STATUS_FAILEDDEP);
@@ -199,10 +199,10 @@
if ($new->{"AlreadyThere"})
{
# Create a new association between the old album and FullTOC
- MusicBrainz::Server::AlbumCDTOC->Insert($self->{DBH}, $self->GetPrev, $new->{"FullTOC"});
+ MusicBrainz::Server::ReleaseCDTOC->Insert($self->{DBH}, $self->GetPrev, $new->{"FullTOC"});
} else {
# Move the row back to the old album
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromId($self->{DBH}, $self->GetRowId)
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId)
or return;
$alcdtoc->MoveToAlbum($self->GetPrev);
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -63,8 +63,8 @@
my $cdtoc = $opts{'cdtoc'} or die;
my $oldrelease = $opts{album} or die;
- require MusicBrainz::Server::AlbumCDTOC;
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromAlbumAndCDTOC($self->{DBH}, $oldrelease, $cdtoc->GetId);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromReleaseAndCDTOC($self->{DBH}, $oldrelease, $cdtoc->GetId);
if (not $alcdtoc)
{
$self->SetError("Old album / CD TOC not found");
@@ -133,9 +133,9 @@
{
my $self = shift;
- require MusicBrainz::Server::AlbumCDTOC;
+ require MusicBrainz::Server::ReleaseCDTOC;
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromId($self->{DBH}, $self->GetRowId);
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId);
if (not $alcdtoc)
{
$self->InsertNote(MODBOT_MODERATOR, "This disc ID has already been removed");
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -471,8 +471,8 @@
return if (!defined $album);
$sql = Sql->new($this->{DBH});
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->RemoveAlbum($this->{DBH}, $album);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->RemoveAlbum($this->{DBH}, $album);
print STDERR "DELETE: Removed release where album was " . $album . "\n";
require MusicBrainz::Server::ReleaseEvent;
@@ -827,7 +827,7 @@
my ($self, $loadlabels) = @_;
require MusicBrainz::Server::ReleaseEvent;
my $rel = MusicBrainz::Server::ReleaseEvent->new($self->{DBH});
- $rel->newFromAlbum($self->GetId, $loadlabels);
+ $rel->newFromRelease($self->GetId, $loadlabels);
}
sub GetDiscIDs
@@ -836,8 +836,8 @@
$self->{"_discids"} ||= do
{
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->newFromAlbum($self->{DBH}, $self);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->newFromRelease($self->{DBH}, $self);
};
}
@@ -1066,8 +1066,8 @@
$this->MergeLanguageAndScriptFrom($al) if $merge_langscript;
# Also merge the Discids
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->MergeAlbums($this->{DBH}, $id, $this->GetId);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->MergeAlbums($this->{DBH}, $id, $this->GetId);
# And the releases
require MusicBrainz::Server::ReleaseEvent;
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -134,7 +134,7 @@
$c;
}
# This doesn't have to always contain the actual label name. Use it
-# only on instances loaded by newFromAlbum.
+# only on instances loaded by newFromRelease.
sub GetLabelName { $_[0]{labelname} }
sub SetLabelName { $_[0]{labelname} = $_[1] }
sub GetLabelMBId { $_[0]{labelgid} }
@@ -200,7 +200,7 @@
);
}
-sub newFromAlbum
+sub newFromRelease
{
my ($self, $album, $loadlabels) = @_;
my $sql = Sql->new($self->{DBH});
Modified: mb_server/branches/terminology/cgi-bin/QuerySupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 13:13:46 UTC (rev 9733)
@@ -66,8 +66,8 @@
}
# Check to see if the album is in the main database
- require MusicBrainz::Server::AlbumCDTOC;
- $di = MusicBrainz::Server::AlbumCDTOC->new($dbh);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ $di = MusicBrainz::Server::ReleaseCDTOC->new($dbh);
$rdf->SetDepth(5);
return $di->GenerateAlbumFromDiscid($rdf, $id, $toc);
}
@@ -90,8 +90,8 @@
}
# Check to see if the album is in the main database
- require MusicBrainz::Server::AlbumCDTOC;
- $di = MusicBrainz::Server::AlbumCDTOC->new($dbh);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ $di = MusicBrainz::Server::ReleaseCDTOC->new($dbh);
$di->Insert($albumid, $toc);
}
Modified: mb_server/branches/terminology/htdocs/bare/cdlookup.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/cdlookup.html 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/htdocs/bare/cdlookup.html 2008-03-09 13:13:46 UTC (rev 9733)
@@ -86,7 +86,7 @@
# If we have no TOC then we cannot add the release if it's missing. So just
# look for the release (based on CDIndex ID or FreeDB ID) and show whatever we
# find. etrieve the releases matching the given ID
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->new($mb->{DBH});
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->new($mb->{DBH});
my $releaseids = (
$discid
? $alcdtoc->GetAlbumIDsFromDiscID($discid)
@@ -176,7 +176,7 @@
if ($cdtoc)
{
- my $alcdtocs = $cdtoc->GetAlbumCDTOCs;
+ my $alcdtocs = $cdtoc->GetReleaseCDTOCs;
$releaseids = [ map { $_->GetAlbumId } @$alcdtocs ];
}
}
Modified: mb_server/branches/terminology/htdocs/bare/xget.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/xget.html 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/htdocs/bare/xget.html 2008-03-09 13:13:46 UTC (rev 9733)
@@ -53,7 +53,7 @@
$artist = MusicBrainz::Server::Artist->new($mb->{DBH});
$release = MusicBrainz::Server::Release->new($mb->{DBH});
- $di = MusicBrainz::Server::AlbumCDTOC->new($mb->{DBH});
+ $di = MusicBrainz::Server::ReleaseCDTOC->new($mb->{DBH});
my $releaseids = $di->GetAlbumIDsFromDiscID($discid);
if (not @$releaseids)
Modified: mb_server/branches/terminology/htdocs/edit/discid/move.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-09 13:13:46 UTC (rev 9733)
@@ -72,7 +72,7 @@
my $release = $m->comp("/comp/loadrelease", $mb, $releaseid);
# Get the cdtoc / release_cdtoc
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromAlbumAndCDTOC($mb->{DBH}, $release, $tocid)
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromReleaseAndCDTOC($mb->{DBH}, $release, $tocid)
or return $m->comp(
"/comp/error",
"No such CDTOC #$tocid, or it is not linked to release #$releaseid",
Modified: mb_server/branches/terminology/htdocs/edit/discid/remove.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/discid/remove.html 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/htdocs/edit/discid/remove.html 2008-03-09 13:13:46 UTC (rev 9733)
@@ -36,7 +36,7 @@
# Get the cdtoc / album_cdtoc
- my $alcdtoc = MusicBrainz::Server::AlbumCDTOC->newFromAlbumAndCDTOC($mb->{DBH}, $release, $tocid)
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromReleaseAndCDTOC($mb->{DBH}, $release, $tocid)
or return $m->comp(
"/comp/error",
"No such CDTOC #$tocid, or it is not linked to album #$releaseid",
Modified: mb_server/branches/terminology/htdocs/show/cdtoc/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/cdtoc/index.html 2008-03-09 12:59:06 UTC (rev 9732)
+++ mb_server/branches/terminology/htdocs/show/cdtoc/index.html 2008-03-09 13:13:46 UTC (rev 9733)
@@ -53,7 +53,7 @@
<& /comp/tablebegin, title => "Releases linked to this CD TOC" &>
-% my $alcdtocs = $cdtoc->GetAlbumCDTOCs;
+% my $alcdtocs = $cdtoc->GetReleaseCDTOCs;
% if (@$alcdtocs)
% {
More information about the MusicBrainz-commits
mailing list