[mb-commits] r9758 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/cdi htdocs/comp htdocs/comp/browse htdocs/comp/release_editor htdocs/edit/album htdocs/edit/albumreleases htdocs/edit/discid htdocs/show/artist htdocs/show/label htdocs/show/puid htdocs/show/trm
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 18:04:19 UTC 2008
Author: luks
Date: 2008-03-10 18:04:18 +0000 (Mon, 10 Mar 2008)
New Revision: 9758
Modified:
mb_server/branches/terminology/cgi-bin/FreeDB.pm
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/MM.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.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_PUID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm
mb_server/branches/terminology/cgi-bin/TableBase.pm
mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
mb_server/branches/terminology/htdocs/cdi/searchartistrelease.html
mb_server/branches/terminology/htdocs/comp/browse/filtersbox
mb_server/branches/terminology/htdocs/comp/loadtrack
mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
mb_server/branches/terminology/htdocs/comp/release_editor/review
mb_server/branches/terminology/htdocs/edit/album/attrform
mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html
mb_server/branches/terminology/htdocs/edit/discid/move.html
mb_server/branches/terminology/htdocs/show/artist/index.html
mb_server/branches/terminology/htdocs/show/label/index.html
mb_server/branches/terminology/htdocs/show/puid/index.html
mb_server/branches/terminology/htdocs/show/trm/index.html
Log:
Various Album -> Release renames...
Modified: mb_server/branches/terminology/cgi-bin/FreeDB.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -403,7 +403,7 @@
}
my $album = lc(decode "utf-8", $info->{album});
- @albums = $ar->GetAlbums();
+ @albums = $ar->GetReleases();
foreach $al (@albums)
{
my $thisname = lc(decode "utf-8", $al->GetName);
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -613,7 +613,7 @@
die "Skipped Insert: Release country is required\n";
}
- $rel->SetAlbum($albumid);
+ $rel->SetRelease($albumid);
$rel->SetYMD(@ymd);
$rel->SetCountry($release->{country});
$rel->SetLabel($release->{label});
Modified: mb_server/branches/terminology/cgi-bin/MM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -151,7 +151,7 @@
require MusicBrainz::Server::Release;
my $al = MusicBrainz::Server::Release->new($this->{DBH});
- my @ids = $al->GetAlbumIdsFromTrackId($tr->GetId());
+ my @ids = $al->GetReleaseIdsFromTrackId($tr->GetId());
$al->SetId($ids[0]);
# TODO this is complaining that the album ID is false
$al->LoadFromId();
@@ -550,7 +550,7 @@
return ();
}
- @albums = $artist->GetAlbums();
+ @albums = $artist->GetReleases();
foreach $album (@albums)
{
next if not defined $album;
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -1735,7 +1735,7 @@
# assume that the release needs to be loaded from
# the album-track core relationship, if it not
# has been set explicitly.
- $this->{"albumid"} = $track->GetAlbum if ($this->{"checkexists-album"} && not defined $this->{"albumid"});
+ $this->{"albumid"} = $track->GetRelease if ($this->{"checkexists-album"} && not defined $this->{"albumid"});
}
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -958,7 +958,7 @@
# references to Album objects. Refer to the Album object for details.
# The returned array is empty on error. Multiple artist albums are
# also returned by this query. Use SetId() to set the id of artist
-sub GetAlbums
+sub GetReleases
{
my ($this, $novartist, $loadmeta, $onlyvartist) = @_;
my (@albums, $sql, @row, $album, $query);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -333,7 +333,7 @@
}
if (defined $info)
{
- my @albums = $ar->GetAlbums(!$info->{va}, 1, $info->{va});
+ my @albums = $ar->GetReleases(!$info->{va}, 1, $info->{va});
if (scalar(@albums) && ($info->{type} != -1 || $info->{status} != -1))
{
my @filtered;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -866,7 +866,7 @@
# retreive the set of albums by this label. Returns an array of
# references to Album objects. Refer to the Album object for details.
# The returned array is empty on error.
-sub GetAlbums
+sub GetReleases
{
my ($this) = @_;
my $sql = Sql->new($this->{DBH});
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -665,7 +665,7 @@
# Removing
################################################################################
-sub RemoveByAlbum
+sub RemoveByRelease
{
my ($self, $entityid) = @_;
$self->_Remove($entityid, "album");
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -199,7 +199,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($trackid);
- $track->SetAlbum($releaseid);
+ $track->SetRelease($releaseid);
unless ($track->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -130,7 +130,7 @@
# since the track exists, we can see if can load the
# corresponding release.
- $this->{"albumid"} = $track->GetAlbum;
+ $this->{"albumid"} = $track->GetRelease;
$this->{"checkexists-album"} = 1;
# try to guess artist id.
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -71,7 +71,7 @@
$i = 0;
for my $row (@adds)
{
- die unless $row->GetAlbum == $al->GetId;
+ die unless $row->GetRelease == $al->GetId;
$row->InsertSelf;
$new{"add".$i++} = sprintf "d=%s c=%d id=%d l=%d n=%s b=%s f=%d",
$row->GetSortDate,
@@ -87,7 +87,7 @@
for my $row (@edits)
{
my $obj = $row->{"object"};
- die unless $obj->GetAlbum == $al->GetId;
+ die unless $obj->GetRelease == $al->GetId;
my $old = sprintf "d=%s c=%d id=%d l=%d n=%s b=%s f=%d",
$obj->GetSortDate,
@@ -119,7 +119,7 @@
$i = 0;
for my $row (@removes)
{
- die unless $row->GetAlbum == $al->GetId;
+ die unless $row->GetRelease == $al->GetId;
$new{"remove".$i++} = sprintf "d=%s c=%d id=%d l=%d n=%s b=%s f=%d",
$row->GetSortDate,
$row->GetCountry,
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -82,7 +82,7 @@
if ($tr->LoadFromId())
{
my $rel = MusicBrainz::Server::Release->new($self->{DBH});
- $rel->SetId($tr->GetAlbum());
+ $rel->SetId($tr->GetRelease());
if ($rel->LoadFromId())
{
return $rel->GetQuality();
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -63,7 +63,7 @@
require MusicBrainz::Server::Release;
my $release = MusicBrainz::Server::Release->new($self->{DBH});
- $release->SetId($track->GetAlbum);
+ $release->SetId($track->GetRelease);
if ($self->{'albumexists'} = $release->LoadFromId)
{
$self->{'albumid'} = $release->GetId;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -74,7 +74,7 @@
if ($tr->LoadFromId())
{
my $rel = MusicBrainz::Server::Release->new($self->{DBH});
- $rel->SetId($tr->GetAlbum());
+ $rel->SetId($tr->GetRelease());
if ($rel->LoadFromId())
{
return $rel->GetQuality();
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-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -94,7 +94,7 @@
# This is one of those mods where we give the user instant gratification,
# then undo the mod later if it's rejected.
my $already_there;
- $alcdtoc->MoveToAlbum($newal, \$already_there);
+ $alcdtoc->MoveToRelease($newal, \$already_there);
$self->SetTable("album_cdtoc");
$self->SetColumn("album");
@@ -204,7 +204,7 @@
# Move the row back to the old album
my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId)
or return;
- $alcdtoc->MoveToAlbum($self->GetPrev);
+ $alcdtoc->MoveToRelease($self->GetPrev);
}
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -87,7 +87,7 @@
if ($tr->LoadFromId())
{
my $rel = MusicBrainz::Server::Release->new($self->{DBH});
- $rel->SetId($tr->GetAlbum());
+ $rel->SetId($tr->GetRelease());
if ($rel->LoadFromId())
{
return $rel->GetQuality();
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -87,7 +87,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->GetRowId);
- $track->SetAlbum($this->{'prev.albumid'});
+ $track->SetRelease($this->{'prev.albumid'});
# Remove the album join for this track
$track->RemoveFromAlbum;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -87,7 +87,7 @@
if ($tr->LoadFromId())
{
my $rel = MusicBrainz::Server::Release->new($self->{DBH});
- $rel->SetId($tr->GetAlbum());
+ $rel->SetId($tr->GetRelease());
if ($rel->LoadFromId())
{
return $rel->GetQuality();
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -62,10 +62,10 @@
use constant RELEASE_ATTR_BOOTLEG => 102;
use constant RELEASE_ATTR_PSEUDO_RELEASE => 103;
-use constant RELEASE_ATTR_SECTION_TYPE_START => ALBUM_ATTR_ALBUM;
-use constant RELEASE_ATTR_SECTION_TYPE_END => ALBUM_ATTR_OTHER;
-use constant RELEASE_ATTR_SECTION_STATUS_START => ALBUM_ATTR_OFFICIAL;
-use constant RELEASE_ATTR_SECTION_STATUS_END => ALBUM_ATTR_PSEUDO_RELEASE;
+use constant RELEASE_ATTR_SECTION_TYPE_START => RELEASE_ATTR_ALBUM;
+use constant RELEASE_ATTR_SECTION_TYPE_END => RELEASE_ATTR_OTHER;
+use constant RELEASE_ATTR_SECTION_STATUS_START => RELEASE_ATTR_OFFICIAL;
+use constant RELEASE_ATTR_SECTION_STATUS_END => RELEASE_ATTR_PSEUDO_RELEASE;
my %AlbumAttributeNames = (
0 => [ "Non-Album Track", "Non-Album Tracks", "(Special case)"],
@@ -262,8 +262,8 @@
for (@$attrs)
{
return () if $_ == RELEASE_ATTR_NONALBUMTRACKS;
- $type = $_ if $_ >= RELEASE_ATTR_SECTION_TYPE_START and $_ <= ALBUM_ATTR_SECTION_TYPE_END;
- $status = $_ if $_ >= RELEASE_ATTR_SECTION_STATUS_START and $_ <= ALBUM_ATTR_SECTION_STATUS_END;
+ $type = $_ if $_ >= RELEASE_ATTR_SECTION_TYPE_START and $_ <= RELEASE_ATTR_SECTION_TYPE_END;
+ $status = $_ if $_ >= RELEASE_ATTR_SECTION_STATUS_START and $_ <= RELEASE_ATTR_SECTION_STATUS_END;
}
($type, $status);
}
@@ -355,9 +355,9 @@
$album->GetId,
$t->{_new_sequence},
$t->GetId,
- $t->GetAlbum,
+ $t->GetRelease,
) or die sprintf 'Failed to move track %d from release %d to %d',
- $t->GetId, $t->GetAlbum, $album->GetId;
+ $t->GetId, $t->GetRelease, $album->GetId;
}
# Delete the other albums
@@ -477,7 +477,7 @@
print STDERR "DELETE: Removed release where album was " . $album . "\n";
require MusicBrainz::Server::ReleaseEvent;
my $rel = MusicBrainz::Server::ReleaseEvent->new($sql->{DBH});
- $rel->RemoveByAlbum($album);
+ $rel->RemoveByRelease($album);
if ($sql->Select(qq|select AlbumJoin.track from AlbumJoin
where AlbumJoin.album = $album|))
@@ -497,7 +497,7 @@
# Remove relationships
require MusicBrainz::Server::Link;
my $link = MusicBrainz::Server::Link->new($this->{DBH});
- $link->RemoveByAlbum($album);
+ $link->RemoveByRelease($album);
# Remove tags
require MusicBrainz::Server::Tag;
@@ -512,7 +512,7 @@
require MusicBrainz::Server::Annotation;
MusicBrainz::Server::Annotation->DeleteRelease($this->{DBH}, $album);
- $this->RemoveGlobalIdRedirect($album, &TableBase::TABLE_ALBUM);
+ $this->RemoveGlobalIdRedirect($album, &TableBase::TABLE_RELEASE);
print STDERR "DELETE: Removed Album " . $album . "\n";
$sql->Do("DELETE FROM album WHERE id = ?", $album);
@@ -632,7 +632,7 @@
# This function takes a track id and returns an array of album ids
# on which this track appears. The array is empty on error.
-sub GetAlbumIdsFromTrackId
+sub GetReleaseIdsFromTrackId
{
my ($this, $trackid) = @_;
my $sql = Sql->new($this->{DBH});
@@ -689,7 +689,7 @@
return undef
if ($idcol ne "gid");
- my $newid = $this->CheckGlobalIdRedirect($idval, &TableBase::TABLE_ALBUM)
+ my $newid = $this->CheckGlobalIdRedirect($idval, &TableBase::TABLE_RELEASE)
or return;
$row = $sql->SelectSingleRowArray(
@@ -811,7 +811,7 @@
$track->SetAlbumJoinModPending($row[6]);
$track->SetArtistName($row[7]);
$track->SetMBId($row[8]);
- $track->SetAlbum($row[9]);
+ $track->SetRelease($row[9]);
push @info, $track;
}
}
@@ -1072,7 +1072,7 @@
# And the releases
require MusicBrainz::Server::ReleaseEvent;
my $rel = MusicBrainz::Server::ReleaseEvent->new($sql->{DBH});
- $rel->MoveFromAlbumToAlbum($id, $this->GetId);
+ $rel->MoveFromReleaseToRelease($id, $this->GetId);
# And the annotations
require MusicBrainz::Server::Annotation;
@@ -1084,7 +1084,7 @@
# ... and the tags
$tag->MergeReleases($id, $this->GetId);
- $this->SetGlobalIdRedirect($id, $al->GetMBId, $this->GetId, &TableBase::TABLE_ALBUM);
+ $this->SetGlobalIdRedirect($id, $al->GetMBId, $this->GetId, &TableBase::TABLE_RELEASE);
# Then, finally remove what is left of the old album
$al->Remove();
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -409,7 +409,7 @@
);
}
-sub MoveToAlbum
+sub MoveToRelease
{
my ($self, $album, $already_there_flagref) = @_;
my $sql = Sql->new($self->{DBH});
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -96,13 +96,13 @@
# GetId / SetId - see TableBase
-sub GetAlbum { $_[0]{album} }
-sub SetAlbum { $_[0]{album} = $_[1] }
-sub Album
+sub GetRelease { $_[0]{album} }
+sub SetRelease { $_[0]{album} = $_[1] }
+sub Release
{
my $self = shift;
my $c = MusicBrainz::Server::Release->new($self->{DBH});
- $c->SetId($self->GetAlbum);
+ $c->SetId($self->GetRelease);
$c->LoadFromId or return undef;
$c;
}
@@ -177,7 +177,7 @@
sub ToString {
my $self = shift;
return "ReleaseEvent { Id: " . $self->GetId .
- ", Release: " . $self->GetAlbum .
+ ", Release: " . $self->GetRelease .
", Date: " . $self->{"releasedate"} .
", Country: ".$self->GetCountry .
"}";
@@ -231,7 +231,7 @@
my $sql = Sql->new($self->{DBH});
$sql->Do(
"INSERT INTO release (album, country, releasedate, label, catno, barcode, format) VALUES (?, ?, ?, ?, ?, ?, ?)",
- $self->GetAlbum,
+ $self->GetRelease,
$self->GetCountry,
$self->GetSortDate,
$self->GetLabel || undef,
@@ -291,7 +291,7 @@
);
}
-sub RemoveByAlbum
+sub RemoveByRelease
{
my ($self, $albumid) = @_;
my $sql = Sql->new($self->{DBH});
@@ -301,7 +301,7 @@
);
}
-sub MoveFromAlbumToAlbum
+sub MoveFromReleaseToRelease
{
my ($self, $fromalbumid, $toalbumid) = @_;
my $sql = Sql->new($self->{DBH});
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -71,12 +71,12 @@
$_[0]->{artistname} = $_[1];
}
-sub GetAlbum
+sub GetRelease
{
return $_[0]->{album};
}
-sub SetAlbum
+sub SetRelease
{
$_[0]->{album} = $_[1];
}
@@ -143,11 +143,11 @@
) or return undef;
$this->SetId($t->[0]);
- $this->SetAlbum($t->[1]);
+ $this->SetRelease($t->[1]);
return $this->LoadFromId();
}
-# Load a track. Set the track id and the album id via the SetId and SetAlbum
+# Load a track. Set the track id and the album id via the SetId and SetRelease
# Accessor functions. Return true on success, undef otherwise
sub LoadFromId
{
@@ -475,7 +475,7 @@
my $id = $self->GetId
or croak "Missing track ID in RemoveFromAlbum";
- my $alid = $self->GetAlbum
+ my $alid = $self->GetRelease
or croak "Missing album ID in RemoveFromAlbum";
my $sql = Sql->new($self->{DBH});
Modified: mb_server/branches/terminology/cgi-bin/TableBase.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/TableBase.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/TableBase.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -35,7 +35,7 @@
use constant MAX_PAGE_INDEX_LEVELS => 6;
use constant NUM_BITS_PAGE_INDEX => 5;
-use constant TABLE_ALBUM => 1;
+use constant TABLE_RELEASE => 1;
use constant TABLE_ARTIST => 2;
use constant TABLE_TRACK => 3;
use constant TABLE_LABEL => 4;
Modified: mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-10 18:04:18 UTC (rev 9758)
@@ -487,7 +487,7 @@
}
} else {
# get the complete album list from artist
- @albums = $ar->GetAlbums(0, 1);
+ @albums = $ar->GetReleases(0, 1);
}
if (scalar(@albums) == 0)
Modified: mb_server/branches/terminology/htdocs/cdi/searchartistrelease.html
===================================================================
--- mb_server/branches/terminology/htdocs/cdi/searchartistrelease.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/cdi/searchartistrelease.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -74,7 +74,7 @@
# get all releases, and sort out the unapplicable ones
my ( $release, @foundreleases, %unused);
- my @releaselist = sort { $a->{name} cmp $b->{name} } $artist->GetAlbums(0, 1);
+ my @releaselist = sort { $a->{name} cmp $b->{name} } $artist->GetReleases(0, 1);
for(;;)
{
$release = shift @releaselist;
Modified: mb_server/branches/terminology/htdocs/comp/browse/filtersbox
===================================================================
--- mb_server/branches/terminology/htdocs/comp/browse/filtersbox 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/comp/browse/filtersbox 2008-03-10 18:04:18 UTC (rev 9758)
@@ -40,7 +40,7 @@
$m->out(qq!<table class="listing">!);
$m->out(qq!<tr><td class="left"><b>Release Type: </b></td><td class="left">!);
- for my $rt (0, MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ for my $rt (0, MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START .. MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
my $name = ($rt ? MusicBrainz::Server::Release->GetAttributeName($rt) : "All");
$m->out(" | ") if $rt;
@@ -51,7 +51,7 @@
$m->out(qq!</td></tr>!);
$m->out(qq!<tr><td class="left"><b>Release Status: </b></td><td class="left">!);
- for my $rt (0, MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ for my $rt (0, MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START .. MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
my $name = ($rt ? MusicBrainz::Server::Release->GetAttributeName($rt) : "All");
$m->out(" | ") if $rt;
Modified: mb_server/branches/terminology/htdocs/comp/loadtrack
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadtrack 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/comp/loadtrack 2008-03-10 18:04:18 UTC (rev 9758)
@@ -71,7 +71,7 @@
# if the releaseid was given, restrict to tracks from this release.
if (defined $releaseid)
{
- $track->SetAlbum($releaseid);
+ $track->SetRelease($releaseid);
$error = sprintf "Track with <strong>id</strong> #%s not found on the release with <strong>releaseid</strong> %s", $trackid, $releaseid;
}
if ($track->LoadFromId(1))
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 18:04:18 UTC (rev 9758)
@@ -232,7 +232,7 @@
$rev->SetBarcode($rev_barcode);
$rev->SetLabel($rev_label);
$rev->SetFormat($rev_format);
- $rev->SetAlbum($releaseid);
+ $rev->SetRelease($releaseid);
push @revnew, $rev;
}
}
@@ -351,7 +351,7 @@
{
$track = MusicBrainz::Server::Track->new($mb->{DBH});
$track->SetId($new_id);
- $track->SetAlbum($releaseid);
+ $track->SetRelease($releaseid);
$track->LoadFromId
or die "Error loading track\n";
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 18:04:18 UTC (rev 9758)
@@ -155,7 +155,7 @@
$rev->SetLabelName($rev_labelname);
$rev->SetLabel($rev_label);
$rev->SetFormat($rev_format);
- $rev->SetAlbum($releaseid);
+ $rev->SetRelease($releaseid);
push @revnew, $rev;
}
}
Modified: mb_server/branches/terminology/htdocs/edit/album/attrform
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-10 18:04:18 UTC (rev 9758)
@@ -138,7 +138,7 @@
label => "Release type",
selection => $type_value,
fieldname => $type_fieldname,
- valuelist => [ &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END ],
+ valuelist => [ &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START .. &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END ],
attrlist => $attrlist,
pushindex => \@indexes,
&>
@@ -147,7 +147,7 @@
label => "Release status",
selection => $status_value,
fieldname => $status_fieldname,
- valuelist => [ &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END ],
+ valuelist => [ &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START .. &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END ],
attrlist => $attrlist,
pushindex => \@indexes,
&>
Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -59,7 +59,7 @@
for my $rel (@{ $edit->{"releases"} })
{
my $revnew = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
- $revnew->SetAlbum($release->GetId);
+ $revnew->SetRelease($release->GetId);
$revnew->SetCountry($rel->{"country"});
$revnew->SetYMD(@$rel{qw( year month day )});
$revnew->SetLabel($rel->{label});
Modified: mb_server/branches/terminology/htdocs/edit/discid/move.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -182,7 +182,7 @@
{
if ($release->GetArtist != &ModDefs::VARTIST_ID)
{
- my @treleases = $artist->GetAlbums(1, 0);
+ my @treleases = $artist->GetReleases(1, 0);
my $newrelease;
while ($newrelease = shift @treleases)
{
Modified: mb_server/branches/terminology/htdocs/show/artist/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/artist/index.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/show/artist/index.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -220,7 +220,7 @@
}
else
{
- @albums = $artist->GetAlbums($short, 1);
+ @albums = $artist->GetReleases($short, 1);
# filter out non album, EP and single releases if in short listing
if ($short)
@@ -249,7 +249,7 @@
# if we netted no albums to show, fetch everything else.
if (scalar(@albums) == 0)
{
- @albums = $artist->GetAlbums(0, 1, $onlyva);
+ @albums = $artist->GetReleases(0, 1, $onlyva);
$dispmode = 3;
}
}
Modified: mb_server/branches/terminology/htdocs/show/label/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/label/index.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/show/label/index.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -71,7 +71,7 @@
and return $m->comp("/comp/layout/badarguments",
text => "The special label DELETED_LABEL cannot be shown.");
- my @albums = $label->GetAlbums;
+ my @albums = $label->GetReleases;
my $CheckAttributes = sub
{
Modified: mb_server/branches/terminology/htdocs/show/puid/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/puid/index.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/show/puid/index.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -115,7 +115,7 @@
for my $trackid (@$ids)
{
- my @releases = $release->GetAlbumIdsFromTrackId($trackid);
+ my @releases = $release->GetReleaseIdsFromTrackId($trackid);
for my $releaseid (@releases)
{
$releases{$releaseid} ||= do {
Modified: mb_server/branches/terminology/htdocs/show/trm/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/trm/index.html 2008-03-10 17:36:49 UTC (rev 9757)
+++ mb_server/branches/terminology/htdocs/show/trm/index.html 2008-03-10 18:04:18 UTC (rev 9758)
@@ -135,7 +135,7 @@
for my $trackid (@$ids)
{
- my @releases = $release->GetAlbumIdsFromTrackId($trackid);
+ my @releases = $release->GetReleaseIdsFromTrackId($trackid);
for my $releaseid (@releases)
{
$releases{$releaseid} ||= do {
More information about the MusicBrainz-commits
mailing list