[mb-commits] r9729 - in mb_server/branches/terminology/cgi-bin: . MusicBrainz/Server MusicBrainz/Server/Handlers/WS/1 MusicBrainz/Server/Moderation
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 09:59:37 UTC 2008
Author: luks
Date: 2008-03-09 09:59:36 +0000 (Sun, 09 Mar 2008)
New Revision: 9729
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
Removed:
mb_server/branches/terminology/cgi-bin/Album.pm
Modified:
mb_server/branches/terminology/cgi-bin/Artist.pm
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/Label.pm
mb_server/branches/terminology/cgi-bin/MM.pm
mb_server/branches/terminology/cgi-bin/MM_2_0.pm
mb_server/branches/terminology/cgi-bin/MM_2_1.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_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_RELEASE_QUALITY.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.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_EDIT_URL.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.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_ALBUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.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/Moderation/MOD_SAC_TO_MAC.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
mb_server/branches/terminology/cgi-bin/QuerySupport.pm
mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
Log:
Rename Album to MusicBrainz::Server::Release
Deleted: mb_server/branches/terminology/cgi-bin/Album.pm
Modified: mb_server/branches/terminology/cgi-bin/Artist.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Artist.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/Artist.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -383,8 +383,8 @@
$old->InvalidateCache;
# Merge any non-album tracks albums together
- require Album;
- my $alb = Album->new($old->{DBH});
+ require MusicBrainz::Server::Release;
+ my $alb = MusicBrainz::Server::Release->new($old->{DBH});
my @non = $alb->FindNonAlbum($n);
$alb->CombineNonAlbums(@non)
if @non > 1;
@@ -988,8 +988,8 @@
{
while(@row = $sql->NextRow)
{
- require Album;
- $album = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $album = MusicBrainz::Server::Release->new($this->{DBH});
$album->SetId($row[0]);
$album->SetName($row[1]);
$album->SetModPending($row[2]);
@@ -1051,8 +1051,8 @@
{
while(@row = $sql->NextRow)
{
- require Album;
- $album = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $album = MusicBrainz::Server::Release->new($this->{DBH});
$album->SetId($row[0]);
$album->SetArtist($row[1]);
$album->SetName($row[2]);
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -210,8 +210,8 @@
require Artist;
my $ar = Artist->new($this->{DBH});
my $mar = Artist->new($this->{DBH});
- require Album;
- my $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
require Track;
my $tr = Track->new($this->{DBH});
require TRM;
Modified: mb_server/branches/terminology/cgi-bin/Label.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Label.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/Label.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -900,8 +900,8 @@
{
while(my @row = $sql->NextRow)
{
- require Album;
- my $album = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $album = MusicBrainz::Server::Release->new($this->{DBH});
$album->SetId($row[0]);
$album->SetArtist($row[1]);
$album->SetName($row[2]);
Modified: mb_server/branches/terminology/cgi-bin/MM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -149,8 +149,8 @@
# TODO This is complaining about the ID being undef
$ar->LoadFromId();
- require Album;
- my $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
my @ids = $al->GetAlbumIdsFromTrackId($tr->GetId());
$al->SetId($ids[0]);
# TODO this is complaining that the album ID is false
@@ -192,8 +192,8 @@
for my $id (@$gids)
{
- require Album;
- my $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetMBId($id);
$al->LoadFromId(1);
@@ -456,8 +456,8 @@
}
elsif ($type eq 'album')
{
- require Album;
- $obj = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $obj = MusicBrainz::Server::Release->new($this->{DBH});
}
elsif ($type eq 'track')
{
Modified: mb_server/branches/terminology/cgi-bin/MM_2_0.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_0.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MM_2_0.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -125,13 +125,13 @@
my @attrs = $album->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
$out .= $this->Element("rdf:type", "", "rdf:resource", $this->GetMMNamespace() . $album->GetAttributeName($attr));
}
- elsif ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
{
$out .= $this->Element("mm:release", "", "rdf:resource", $this->GetMMNamespace() . $album->GetAttributeName($attr));
}
Modified: mb_server/branches/terminology/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -170,14 +170,14 @@
my @attrs = $album->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
$out .= $this->Element("mm:releaseType", "", "rdf:resource", $this->GetMMNamespace() .
"Type" . $album->GetAttributeName($attr));
}
- elsif ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
{
$out .= $this->Element("mm:releaseStatus", "", "rdf:resource", $this->GetMMNamespace() .
"Status" . $album->GetAttributeName($attr));
@@ -228,7 +228,7 @@
if (scalar(@$ids))
{
$complete = $$ids[scalar(@$ids) - 1]->{tracknum} != (scalar(@$ids) + 1);
- $complete = 1 if (!$complete && $album->GetName() eq &Album::NONALBUMTRACKS_NAME);
+ $complete = 1 if (!$complete && $album->GetName() eq &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME);
foreach $track (@$ids)
{
my $li = $complete ? "rdf:li" : ("rdf:_" . $track->{tracknum});
@@ -802,7 +802,7 @@
$out .= $this->OutputArtistRDF({ obj=> $temp });
} elsif ($type eq 'album')
{
- $temp = Album->new($this->{DBH});
+ $temp = MusicBrainz::Server::Release->new($this->{DBH});
$temp->SetId($id);
die if (!$temp->LoadFromId());
$out .= $this->OutputAlbumRDF({ obj=> $temp });
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -1744,8 +1744,8 @@
# implementations of the edit types
if ($this->{"checkexists-album"} && defined $this->{"albumid"})
{
- require Album;
- my $release = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($this->{DBH});
$release->SetId($this->{"albumid"});
if ($this->{"exists-album"} = $release->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -69,8 +69,8 @@
my $self = shift;
my $id = $self->GetAlbumId;
- require Album;
- my $album = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $album = MusicBrainz::Server::Release->new($self->{DBH});
$album->SetId($id);
$album->LoadFromId
and return $album;
@@ -318,7 +318,7 @@
for my $id (@$albumids)
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($id);
$al->LoadFromId();
push @mbids, $al->GetMBId;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -31,7 +31,7 @@
use Carp qw( croak );
use base qw( TableBase );
require Artist;
-require Album;
+require MusicBrainz::Server::Release;
require Track;
################################################################################
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -49,7 +49,8 @@
use Apache::Constants qw( );
use Apache::File ();
use Encode qw( decode encode );
-use Album;
+use MusicBrainz::Server::Release;
+use MusicBrainz::Server::ReleaseEvent;
use MusicBrainz::Server::Country;
use MusicBrainz::Server::LuceneSearch;
@@ -112,34 +113,34 @@
my %typeShortcuts =
(
- 'NonAlbumTrack' => Album::ALBUM_ATTR_NONALBUMTRACKS,
- 'Album' => Album::ALBUM_ATTR_ALBUM,
- 'Single' => Album::ALBUM_ATTR_SINGLE,
- 'EP' => Album::ALBUM_ATTR_EP,
- 'Compilation' => Album::ALBUM_ATTR_COMPILATION,
- 'Soundtrack' => Album::ALBUM_ATTR_SOUNDTRACK,
- 'Spokenword' => Album::ALBUM_ATTR_SPOKENWORD,
- 'Interview' => Album::ALBUM_ATTR_INTERVIEW,
- 'Audiobook' => Album::ALBUM_ATTR_AUDIOBOOK,
- 'Live' => Album::ALBUM_ATTR_LIVE,
- 'Remix' => Album::ALBUM_ATTR_REMIX,
- 'Other' => Album::ALBUM_ATTR_OTHER
+ 'NonAlbumTrack' => MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS,
+ 'Album' => MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM,
+ 'Single' => MusicBrainz::Server::Release::ALBUM_ATTR_SINGLE,
+ 'EP' => MusicBrainz::Server::Release::ALBUM_ATTR_EP,
+ 'Compilation' => MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION,
+ 'Soundtrack' => MusicBrainz::Server::Release::ALBUM_ATTR_SOUNDTRACK,
+ 'Spokenword' => MusicBrainz::Server::Release::ALBUM_ATTR_SPOKENWORD,
+ 'Interview' => MusicBrainz::Server::Release::ALBUM_ATTR_INTERVIEW,
+ 'Audiobook' => MusicBrainz::Server::Release::ALBUM_ATTR_AUDIOBOOK,
+ 'Live' => MusicBrainz::Server::Release::ALBUM_ATTR_LIVE,
+ 'Remix' => MusicBrainz::Server::Release::ALBUM_ATTR_REMIX,
+ 'Other' => MusicBrainz::Server::Release::ALBUM_ATTR_OTHER
);
my %statusShortcuts =
(
- 'Official' => Album::ALBUM_ATTR_OFFICIAL,
- 'Promotion' => Album::ALBUM_ATTR_PROMOTION,
- 'Bootleg' => Album::ALBUM_ATTR_BOOTLEG,
- 'PseudoRelease' => Album::ALBUM_ATTR_PSEUDO_RELEASE,
- 'sa-Official' => Album::ALBUM_ATTR_OFFICIAL,
- 'sa-Promotion' => Album::ALBUM_ATTR_PROMOTION,
- 'sa-Bootleg' => Album::ALBUM_ATTR_BOOTLEG,
- 'sa-PseudoRelease' => Album::ALBUM_ATTR_PSEUDO_RELEASE,
- 'va-Official' => Album::ALBUM_ATTR_OFFICIAL,
- 'va-Promotion' => Album::ALBUM_ATTR_PROMOTION,
- 'va-Bootleg' => Album::ALBUM_ATTR_BOOTLEG,
- 'va-PseudoRelease' => Album::ALBUM_ATTR_PSEUDO_RELEASE,
+ 'Official' => MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL,
+ 'Promotion' => MusicBrainz::Server::Release::ALBUM_ATTR_PROMOTION,
+ 'Bootleg' => MusicBrainz::Server::Release::ALBUM_ATTR_BOOTLEG,
+ 'PseudoRelease' => MusicBrainz::Server::Release::ALBUM_ATTR_PSEUDO_RELEASE,
+ 'sa-Official' => MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL,
+ 'sa-Promotion' => MusicBrainz::Server::Release::ALBUM_ATTR_PROMOTION,
+ 'sa-Bootleg' => MusicBrainz::Server::Release::ALBUM_ATTR_BOOTLEG,
+ 'sa-PseudoRelease' => MusicBrainz::Server::Release::ALBUM_ATTR_PSEUDO_RELEASE,
+ 'va-Official' => MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL,
+ 'va-Promotion' => MusicBrainz::Server::Release::ALBUM_ATTR_PROMOTION,
+ 'va-Bootleg' => MusicBrainz::Server::Release::ALBUM_ATTR_BOOTLEG,
+ 'va-PseudoRelease' => MusicBrainz::Server::Release::ALBUM_ATTR_PSEUDO_RELEASE,
);
my %formatNames =
@@ -579,7 +580,7 @@
my @albums = $tr->GetAlbumInfo();
if (scalar(@albums))
{
- my $al = Album->new($ar->{DBH});
+ my $al = MusicBrainz::Server::Release->new($ar->{DBH});
print '<release-list>';
foreach my $i (@albums)
{
@@ -735,7 +736,7 @@
}
else
{
- $temp = Album->new($dbh);
+ $temp = MusicBrainz::Server::Release->new($dbh);
MusicBrainz::Server::Validation::IsGUID($id) ? $temp->SetMBId($id) : $temp->SetId($id);
die "Could not load release $id\n" if (!$temp->LoadFromId());
$cache->{$k} = $temp;
@@ -955,7 +956,7 @@
}
if (defined $args->{releasestatus} && $args->{releasestatus} =~ /^\d+$/)
{
- $query .= " AND status:" . ($args->{releasestatus} - Album::ALBUM_ATTR_SECTION_STATUS_START + 1) . "^0.0001";
+ $query .= " AND status:" . ($args->{releasestatus} - MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START + 1) . "^0.0001";
}
if ($args->{count} > 0)
{
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 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -146,10 +146,10 @@
require MusicBrainz;
my $mb = MusicBrainz->new;
$mb->Login;
- require Album;
+ require MusicBrainz::Server::Release;
my @albums;
- $al = Album->new($mb->{DBH});
+ $al = MusicBrainz::Server::Release->new($mb->{DBH});
if ($mbid)
{
$al->SetMBId($mbid);
@@ -169,7 +169,7 @@
{
foreach my $id (@$albumids)
{
- $al = Album->new($mb->{DBH});
+ $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId($id);
return undef unless $al->LoadFromId(1);
push @albums, $al;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -183,7 +183,7 @@
my $sql = Sql->new($mb->{DBH});
require Artist;
- require Album;
+ require MusicBrainz::Server::Release;
require Label;
require Track;
@@ -194,7 +194,7 @@
}
elsif ($entity eq 'release')
{
- $obj = Album->new($sql->{DBH});
+ $obj = MusicBrainz::Server::Release->new($sql->{DBH});
}
elsif ($entity eq 'track')
{
@@ -231,7 +231,7 @@
$user = $user->newFromName($user_name) or die "Cannot load user.\n";
require Artist;
- require Album;
+ require MusicBrainz::Server::Release;
require Label;
require Track;
@@ -242,7 +242,7 @@
}
elsif ($entity_type eq 'release')
{
- $obj = Album->new($maindb->{DBH});
+ $obj = MusicBrainz::Server::Release->new($maindb->{DBH});
}
elsif ($entity_type eq 'track')
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -33,7 +33,7 @@
require MusicBrainz::Server::Attribute;
require MusicBrainz::Server::URL;
require Artist;
-require Album;
+require MusicBrainz::Server::Release;
require Track;
################################################################################
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -132,8 +132,8 @@
sub newFromId
{
my ($class, $dbh, $id) = @_;
- require Album;
- my $object = Album->new($dbh);
+ require MusicBrainz::Server::Release;
+ my $object = MusicBrainz::Server::Release->new($dbh);
$object->SetId($id);
$object->LoadFromId or return undef;
$object;
@@ -142,8 +142,8 @@
sub newFromMBId
{
my ($class, $dbh, $id) = @_;
- require Album;
- my $object = Album->new($dbh);
+ require MusicBrainz::Server::Release;
+ my $object = MusicBrainz::Server::Release->new($dbh);
$object->SetMBId($id);
$object->LoadFromId or return undef;
$object;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -313,7 +313,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
@@ -334,8 +334,8 @@
if (my $album = $new->{'AlbumId'})
{
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($album);
$al->Remove;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -121,7 +121,7 @@
@$entities[0]->{type} eq 'album' &&
@$entities[1]->{type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId(@$entities[0]->{id});
if ($al->LoadFromId(1))
{
@@ -137,7 +137,7 @@
@$entities[0]->{type} eq 'album' &&
@$entities[1]->{type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId(@$entities[0]->{id});
if ($al->LoadFromId(1))
{
@@ -163,7 +163,7 @@
my $new = $self->{'new_unpacked'};
if ($new->{entity0type} eq 'album' || $new->{entity1type} eq 'album')
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($new->{entity0type} eq 'album' ? $new->{entity0id} : $new->{entity1id});
if ($rel->LoadFromId())
{
@@ -198,7 +198,7 @@
$new->{entity0type} eq 'album' &&
$new->{entity1type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{entity0id});
MusicBrainz::Server::CoverArt->UpdateAmazonData($al, -1)
if ($al->LoadFromId(1));
@@ -207,7 +207,7 @@
$new->{entity0type} eq 'album' &&
$new->{entity1type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{entity0id});
MusicBrainz::Server::CoverArt->UpdateCoverArtData($al, -1)
if ($al->LoadFromId(1));
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -49,8 +49,8 @@
{
$artist or die;
- require Album;
- $release = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ $release = MusicBrainz::Server::Release->new($self->{DBH});
$release = $release->GetOrInsertNonAlbum($artist->GetId);
$nonalbum = 1;
}
@@ -171,7 +171,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{albumid});
if ($rel->LoadFromId())
{
@@ -217,8 +217,8 @@
$track->Remove;
# Try to remove the album if it's a "non-album" album
- require Album;
- my $release = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($self->{DBH});
$release->SetId($releaseid);
if ($release->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -132,11 +132,11 @@
my @releases;
my $status = undef;
- require Album;
+ require MusicBrainz::Server::Release;
for (my $i = 0; defined $new->{"ReleaseId$i"}; $i++)
{
my $id = $new->{"ReleaseId$i"};
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($id);
unless ( $al->LoadFromId )
@@ -182,11 +182,11 @@
my @releases;
my $status = undef;
- require Album;
+ require MusicBrainz::Server::Release;
for (my $i = 0; defined $new->{"ReleaseId$i"}; $i++)
{
my $id = $new->{"ReleaseId$i"};
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($id);
$al->LoadFromId;
$al->UpdateQualityModPending($adjust)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -162,7 +162,7 @@
my $quality_level = &ModDefs::QUALITY_NORMAL;
if (scalar(@{$self->{'new_albums'}}) == 1)
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{new_albums}->[0]->{id});
if ($rel->LoadFromId())
{
@@ -175,8 +175,8 @@
sub ConvertToText
{
my $self = shift;
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
join ", ",
map {
@@ -194,8 +194,8 @@
# for them was zero).
# Now though we apply the modpending change to all affected releases.
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
for my $album (@{ $self->{'new_albums'} })
{
@@ -212,8 +212,8 @@
sub DeniedAction
{
my $self = shift;
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
for my $t (@{ $self->{'new_albums'} })
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -60,7 +60,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{albumid});
if ($rel->LoadFromId())
{
@@ -81,8 +81,8 @@
my $self = shift;
# Load the album by ID
- require Album;
- my $release = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($self->{DBH});
$release->SetId($self->GetRowId);
unless ($release->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -135,7 +135,7 @@
# Take the quality level from the first release or set to normal for multiple releases
if (scalar(@{$self->{'_new_albums'}}) == 1)
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{_new_albums}->[0]->{id});
if ($rel->LoadFromId())
{
@@ -150,8 +150,8 @@
my ($self, $adjust) = @_;
my $albums = $self->{_new_albums};
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
foreach my $album ( @$albums )
{
@@ -169,11 +169,11 @@
my @albums;
my $status = undef;
- require Album;
+ require MusicBrainz::Server::Release;
for (my $i = 0; defined $new->{"AlbumId$i"}; $i++)
{
my $id = $new->{"AlbumId$i"};
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($id);
unless ( $al->LoadFromId )
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -127,7 +127,7 @@
my $new = $self->{'new_unpacked'};
if ($new->{newentity0type} eq 'album' || $new->{newentity1type} eq 'album')
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($new->{newentity0type} eq 'album' ? $new->{newentity0id} : $new->{newentity1id});
if ($rel->LoadFromId())
{
@@ -258,7 +258,7 @@
# must be checked as well when implemented
if ($new->{newlinktypeid} != $asintypeid)
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{oldentity0id});
MusicBrainz::Server::CoverArt->UpdateAmazonData($al, -1)
@@ -270,7 +270,7 @@
$new->{newentity1type} eq 'url')
{
# reverse case, link type changed _to_ Amazon AR
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{newentity0id});
MusicBrainz::Server::CoverArt->ParseAmazonURL($new->{newentity1name}, $al);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -61,7 +61,7 @@
my @edits = @{ $opts{"edits"} || [] };
my @removes = @{ $opts{"removes"} || [] };
- use Album;
+ use MusicBrainz::Server::Release;
my %new = (
albumid => $al->GetId,
albumname => $al->GetName,
@@ -196,7 +196,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -81,7 +81,7 @@
$tr->SetId($self->{trackid});
if ($tr->LoadFromId())
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($tr->GetAlbum());
if ($rel->LoadFromId())
{
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -61,8 +61,8 @@
$self->{'trackid'} = $track->GetId;
$self->{'trackname'} = $track->GetName;
- require Album;
- my $release = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($self->{DBH});
$release->SetId($track->GetAlbum);
if ($self->{'albumexists'} = $release->LoadFromId)
{
@@ -79,7 +79,7 @@
# see if we loaded the album
if ($self->{'albumexists'})
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{albumid});
if ($rel->LoadFromId())
{
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -73,7 +73,7 @@
$tr->SetId($self->{trackid});
if ($tr->LoadFromId())
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($tr->GetAlbum());
if ($rel->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -64,7 +64,7 @@
);
if (@links)
{
- my $album = Album->new($self->{DBH});
+ my $album = MusicBrainz::Server::Release->new($self->{DBH});
$album->SetId($links[0]->{link0_id});
$artist = $album->GetArtist
if ($album->LoadFromId(0));
@@ -111,7 +111,7 @@
# See if we have an album url link
if (@links)
{
- my $album = Album->new($self->{DBH});
+ my $album = MusicBrainz::Server::Release->new($self->{DBH});
$album->SetId($links[0]->{link0_id});
return $album->GetQuality
if ($album->LoadFromId(0));
@@ -161,7 +161,7 @@
$link->{link0_type} eq 'album' &&
$link->{link1_type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($link->{link0_id});
if ($al->LoadFromId(1))
{
@@ -175,7 +175,7 @@
$link->{link0_type} eq 'album' &&
$link->{link1_type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($link->{link0_id});
if ($al->LoadFromId(1))
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -84,7 +84,7 @@
my $level = &ModDefs::QUALITY_UNKNOWN_MAPPED;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
@@ -114,8 +114,8 @@
unless (defined $this->{'new.name'});
# load album name
- require Album;
- my $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetId($this->GetRowId);
if ($al->LoadFromId)
{
@@ -149,8 +149,8 @@
my $rowid = $self->GetRowId;
# Load the album by ID
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($rowid);
unless ($al->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -115,7 +115,7 @@
my $artistid = -1;
for(my $i = 0;;$i++)
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
last if (!exists $new->{"AlbumId$i"});
$rel->SetId($new->{"AlbumId$i"});
if ($rel->LoadFromId())
@@ -146,8 +146,8 @@
sub AdjustModPending
{
my ($self, $adjust) = @_;
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
# Prior to the ModerationClasses2 branch, the "mod pending" change would
# only be applied to the album listed in $self->GetRowId, i.e. the target
@@ -165,8 +165,8 @@
{
my $self = shift;
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($self->{'new_into'}{'id'});
unless ($al->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -84,7 +84,7 @@
my $level = &ModDefs::QUALITY_UNKNOWN_MAPPED;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
@@ -121,8 +121,8 @@
my $newartist;
# load album name
- require Album;
- my $release = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($this->{DBH});
$release->SetId($this->GetRowId);
if ($release->LoadFromId)
{
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 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -79,7 +79,7 @@
if ($newal->IsNonAlbumTracks)
{
- $self->SetError("Disc IDs cannot be moved to '".&Album::NONALBUMTRACKS_NAME."'");
+ $self->SetError("Disc IDs cannot be moved to '".&MusicBrainz::Server::Release::NONALBUMTRACKS_NAME."'");
die $self;
}
@@ -131,7 +131,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
my $new = $self->{'new_unpacked'};
$rel->SetId($new->{NewAlbumId});
if ($rel->LoadFromId())
@@ -175,8 +175,8 @@
# Check that the old album still exists
# (the mod is applied, we need to revert it when it is voted down)
- require Album;
- my $oldal = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $oldal = MusicBrainz::Server::Release->new($self->{DBH});
$oldal->SetId($self->GetPrev);
unless ($oldal->LoadFromId)
{
@@ -186,8 +186,8 @@
}
# Check that the new album still exists
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{NewAlbumId});
unless ($al->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -57,7 +57,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
@@ -70,8 +70,8 @@
{
my $this = shift;
- require Album;
- my $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetId($this->GetRowId);
unless ($al->Remove)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -100,7 +100,7 @@
my $new_albums = $self->{new_albums};
if (scalar(@$new_albums) == 1)
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($new_albums->[0]->{id});
if ($rel->LoadFromId())
{
@@ -113,8 +113,8 @@
sub AdjustModPending
{
my ($self, $adjust) = @_;
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
for my $t (@{ $self->{'new_albums'} })
{
@@ -126,8 +126,8 @@
sub ApprovedAction
{
my $self = shift;
- require Album;
- my $al = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
for my $t (@{ $self->{'new_albums'} })
{
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 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -106,7 +106,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{albumid});
if ($rel->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -101,7 +101,7 @@
if ($new->{entity0type} eq 'album' || $new->{entity1type} eq 'album')
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($new->{entity0type} eq 'album' ? $new->{entity0id} : $new->{entity1id});
if ($rel->LoadFromId())
{
@@ -147,7 +147,7 @@
$new->{entity0type} eq 'album' &&
$new->{entity1type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{entity0id});
MusicBrainz::Server::CoverArt->UpdateAmazonData($al, -1)
if ($al->LoadFromId(1));
@@ -156,7 +156,7 @@
$new->{entity0type} eq 'album' &&
$new->{entity1type} eq 'url')
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($new->{entity0id});
MusicBrainz::Server::CoverArt->UpdateCoverArtData($al, -1)
if ($al->LoadFromId(1));
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -86,7 +86,7 @@
$tr->SetId($self->{"trackid"});
if ($tr->LoadFromId())
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($tr->GetAlbum());
if ($rel->LoadFromId())
{
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -71,7 +71,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{albumid});
if ($rel->LoadFromId())
{
@@ -102,8 +102,8 @@
}
# Try to remove the release if it's a "non-album" release
- require Album;
- my $release = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($this->{DBH});
$release->SetId($this->{'prev.albumid'});
if ($release->LoadFromId)
{
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-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -86,7 +86,7 @@
$tr->SetId($self->{"trackid"});
if ($tr->LoadFromId())
{
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($tr->GetAlbum());
if ($rel->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -70,7 +70,7 @@
my $level = &ModDefs::QUALITY_UNKNOWN_MAPPED;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
@@ -92,8 +92,8 @@
my $self = shift;
# Load the album by ID
- require Album;
- my $release = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($self->{DBH});
$release->SetId($self->GetRowId);
unless ($release->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -97,7 +97,7 @@
{
my $self = shift;
- my $rel = Album->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Release->new($self->{DBH});
$rel->SetId($self->{rowid});
if ($rel->LoadFromId())
{
@@ -111,8 +111,8 @@
my $self = shift;
# Load the album by ID
- require Album;
- my $release = Album->new($self->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($self->{DBH});
$release->SetId($self->GetRowId);
unless ($release->LoadFromId)
{
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm (from rev 9728, mb_server/branches/terminology/cgi-bin/Album.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 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -101,7 +101,7 @@
sub Album
{
my $self = shift;
- my $c = Album->new($self->{DBH});
+ my $c = MusicBrainz::Server::Release->new($self->{DBH});
$c->SetId($self->GetAlbum);
$c->LoadFromId or return undef;
$c;
Modified: mb_server/branches/terminology/cgi-bin/QuerySupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -30,7 +30,7 @@
use constant TRM_TOO_SHORT => "f9809ab1-2b0f-4d78-8862-fb425ade8ab9";
use constant TRM_SIGSERVER_BUSY => "c457a4a8-b342-4ec9-8f13-b6bd26c0e400";
-use Album; # for constants
+use MusicBrainz::Server::Release; # for constants
use DBDefs;
use MusicBrainz::Server::Validation;
use MusicBrainz::Server::LogFile qw( lprint lprintf );
@@ -923,9 +923,9 @@
{
my @attrs = $row->[7] =~ /(\d+)/g;
shift @attrs;
- my ($type, $status) = Album->GetReleaseTypeAndStatus(\@attrs);
- $typehash = "Type" . Album->GetAttributeName($type) if $type;
- $statushash = "Status" . Album->GetAttributeName($status) if $status;
+ my ($type, $status) = MusicBrainz::Server::Release->GetReleaseTypeAndStatus(\@attrs);
+ $typehash = "Type" . MusicBrainz::Server::Release->GetAttributeName($type) if $type;
+ $statushash = "Status" . MusicBrainz::Server::Release->GetAttributeName($status) if $status;
}
# Cheat: this is missing the releaseDateList
@@ -1089,8 +1089,8 @@
if (!defined $tid || $tid eq '' || !defined $aid || $aid eq '');
return undef if (!defined $dbh);
- require Album;
- my $album = Album->new($dbh);
+ require MusicBrainz::Server::Release;
+ my $album = MusicBrainz::Server::Release->new($dbh);
$album->SetMBId($aid);
unless ($album->LoadFromId)
{
@@ -1151,14 +1151,14 @@
foreach my $attr (@attrs)
{
- if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
$out .= $rdf->Element("mm:releaseType", "", "rdf:resource", $rdf->GetMMNamespace() .
"Type" . $album->GetAttributeName($attr));
}
- elsif ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
{
$out .= $rdf->Element("mm:releaseStatus", "", "rdf:resource", $rdf->GetMMNamespace() .
"Status" . $album->GetAttributeName($attr));
@@ -1236,7 +1236,7 @@
return $rdf->ErrorRDF("No album GUID given");
}
- my $al = Album->new($dbh);
+ my $al = MusicBrainz::Server::Release->new($dbh);
$al->SetMBId($id);
if (!$al->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-09 09:25:41 UTC (rev 9728)
+++ mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-09 09:59:36 UTC (rev 9729)
@@ -26,7 +26,7 @@
package TaggerSupport;
use strict;
-use Album; # for constants
+use MusicBrainz::Server::Release; # for constants
use String::Similarity;
use Encode qw( encode decode );
@@ -466,8 +466,8 @@
}
# first check, if there are any exact matches for artist & album
- require Album;
- $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetArtist($ar->GetId());
my (@aids) = $al->GetAlbumListFromName($name);
@@ -478,7 +478,7 @@
# (just a speed-up)
foreach my $aid (@aids)
{
- $al = Album->new($this->{DBH});
+ $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetMBId($aid->{mbid});
if ($al->LoadFromId)
{
@@ -510,8 +510,8 @@
my @attrs = $al->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= &Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= &Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
$albumtype = $attr;
last;
@@ -556,8 +556,8 @@
my @attrs = $al->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= &Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= &Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
$albumtype = $attr;
last;
@@ -755,8 +755,8 @@
}
else
{
- require Album;
- $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetMBId($albumId);
if (!defined $al->LoadFromId())
{
@@ -833,8 +833,8 @@
$ar->LoadFromId();
$this->{artist} = $ar;
- require Album;
- $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $al = MusicBrainz::Server::Release->new($this->{DBH});
require SearchEngine;
my $engine = SearchEngine->new($this->{DBH}, 'album');
@@ -865,7 +865,7 @@
artist=>$ar->GetName(),
mbid=>$al->GetMBId(),
name=>$al->GetName(),
- albumtype=>Album::ALBUM_ATTR_COMPILATION
+ albumtype=>MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION
})
]);
}
@@ -881,7 +881,7 @@
push @ids, $this->SetSim(ALBUMID, { id=>$row->{'albumid'},
name=>$row->{'albumname'},
mbid=>$row->{'albumgid'},
- albumtype=>Album::ALBUM_ATTR_COMPILATION });
+ albumtype=>MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION });
}
@ids = sort { $b->{sim} <=> $a->{sim} } @ids;
@@ -987,11 +987,11 @@
# If one album is blank, and the other is an album, copy it over to favor it.
$A{album} = $B{album} if ($A{album} eq '' && $B{album} ne '' &&
- $B{albumtype} == &Album::ALBUM_ATTR_ALBUM);
+ $B{albumtype} == &MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM);
# Now check the reverse case as well.
$B{album} = $A{album} if ($B{album} eq '' && $A{album} ne '' &&
- $A{albumtype} == &Album::ALBUM_ATTR_ALBUM);
+ $A{albumtype} == &MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM);
$index |= 8 if ($A{album} ne '' && $B{album} ne '');
More information about the MusicBrainz-commits
mailing list