[mb-commits] r9731 - in mb_server/branches/terminology: admin admin/cleanup admin/reports admin/sql/updates htdocs htdocs/bare htdocs/comp htdocs/comp/browse htdocs/comp/moderation htdocs/comp/release_editor htdocs/edit/album htdocs/edit/albumreleases htdocs/edit/discid htdocs/edit/track htdocs/freedb htdocs/reports htdocs/show/artist htdocs/show/label htdocs/show/puid htdocs/show/track htdocs/show/trm
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 10:47:13 UTC 2008
Author: luks
Date: 2008-03-09 10:47:12 +0000 (Sun, 09 Mar 2008)
New Revision: 9731
Modified:
mb_server/branches/terminology/admin/RDFDump.pl
mb_server/branches/terminology/admin/cleanup/FixLength.pl
mb_server/branches/terminology/admin/cleanup/SmartQuotes
mb_server/branches/terminology/admin/cleanup/UpdateCoverArt.pl
mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl
mb_server/branches/terminology/admin/reports/DuplicateAlbums
mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers
mb_server/branches/terminology/admin/reports/SuperfluousDataTracks
mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl
mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
mb_server/branches/terminology/admin/sql/updates/20060305-2.pl
mb_server/branches/terminology/admin/startup.pl.default
mb_server/branches/terminology/htdocs/bare/cdlookup.html
mb_server/branches/terminology/htdocs/bare/xget.html
mb_server/branches/terminology/htdocs/browsevarious.html
mb_server/branches/terminology/htdocs/comp/artisttitle
mb_server/branches/terminology/htdocs/comp/browse/filtersbox
mb_server/branches/terminology/htdocs/comp/loadrelease
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_DISCID
mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes
mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes
mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
mb_server/branches/terminology/htdocs/comp/release_editor/review
mb_server/branches/terminology/htdocs/edit/album/attrform
mb_server/branches/terminology/htdocs/edit/album/editattributes.html
mb_server/branches/terminology/htdocs/edit/albumreleases/index.html
mb_server/branches/terminology/htdocs/edit/discid/move.html
mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html
mb_server/branches/terminology/htdocs/freedb/review.html
mb_server/branches/terminology/htdocs/reports/show_album_duplicates.inc
mb_server/branches/terminology/htdocs/reports/show_full_albums.inc
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/track/index.html
mb_server/branches/terminology/htdocs/show/track/relationships.html
mb_server/branches/terminology/htdocs/show/trm/index.html
mb_server/branches/terminology/htdocs/taglookup.html
Log:
Oops, I didn't realize SVN won't commit the whole tree if I'm in a subdirectory.
Modified: mb_server/branches/terminology/admin/RDFDump.pl
===================================================================
--- mb_server/branches/terminology/admin/RDFDump.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/RDFDump.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -32,7 +32,7 @@
use MusicBrainz;
use MM_2_1;
use Artist;
-use Album;
+use MusicBrainz::Server::Release;
use Track;
my $verbose = -t;
@@ -172,7 +172,7 @@
$start = time;
$mx = $sql->Rows();
- $album = Album->new($sql->{DBH});
+ $album = MusicBrainz::Server::Release->new($sql->{DBH});
$sql2 = Sql->new($sql->{DBH});
$sql2->Select(
"SELECT j.album, t.discid
@@ -230,15 +230,15 @@
shift @attrs;
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 .= $rdf->Element("rdf:type", "", "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:release", "", "rdf:resource",
$rdf->GetMMNamespace() . "Status" .
Modified: mb_server/branches/terminology/admin/cleanup/FixLength.pl
===================================================================
--- mb_server/branches/terminology/admin/cleanup/FixLength.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/cleanup/FixLength.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -28,7 +28,7 @@
use strict;
use DBDefs;
-use Album;
+use MusicBrainz::Server::Release;
use MusicBrainz;
use Getopt::Long;
Modified: mb_server/branches/terminology/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 10:47:12 UTC (rev 9731)
@@ -202,8 +202,8 @@
}
elsif ($table eq "album")
{
- require Album;
- my $al = Album->new($sqlWrite->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($sqlWrite->{DBH});
$al->SetId($id);
$al->SetArtist($artistid);
$al->SetName(encode "utf-8", $oname);
Modified: mb_server/branches/terminology/admin/cleanup/UpdateCoverArt.pl
===================================================================
--- mb_server/branches/terminology/admin/cleanup/UpdateCoverArt.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/cleanup/UpdateCoverArt.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -28,7 +28,7 @@
use strict;
use DBDefs;
-use Album;
+use MusicBrainz::Server::Release;
use MusicBrainz;
use MusicBrainz::Server::CoverArt;
@@ -65,7 +65,7 @@
and (coverarturl = '' OR coverarturl is null)");
while (my ($id, $asin, $coverarturl, $url) = $sql->NextRow)
{
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId($id);
if ($al->LoadFromId(1))
{
Modified: mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl
===================================================================
--- mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -32,7 +32,7 @@
package AlbumsToConvert;
use base qw( MusicBrainz::Server::ReportScript );
-use Album;
+use MusicBrainz::Server::Release;
use Artist;
sub GatherData
@@ -85,7 +85,7 @@
for my $album (@album_ids)
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($album);
$al->LoadFromId or next;
Modified: mb_server/branches/terminology/admin/reports/DuplicateAlbums
===================================================================
--- mb_server/branches/terminology/admin/reports/DuplicateAlbums 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/reports/DuplicateAlbums 2008-03-09 10:47:12 UTC (rev 9731)
@@ -25,7 +25,7 @@
use FindBin;
use lib "$FindBin::Bin/../../cgi-bin";
-use Album;
+use MusicBrainz::Server::Release;
use Artist;
use strict;
@@ -75,7 +75,7 @@
my $al;
if (not exists $albums{ $album->{album_mbid} })
{
- $al = Album->new($self->DBH);
+ $al = MusicBrainz::Server::Release->new($self->DBH);
$al->SetMBId($album->{album_mbid});
unless ($al->LoadFromId(0))
{
Modified: mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers
===================================================================
--- mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers 2008-03-09 10:47:12 UTC (rev 9731)
@@ -32,7 +32,7 @@
package DuplicateTrackNumbers;
use base qw( MusicBrainz::Server::ReportScript );
-use Album;
+use MusicBrainz::Server::Release;
sub GatherData
{
@@ -84,7 +84,7 @@
ORDER BY
ar.sortname, al.name
EOF
- [ &Album::ALBUM_ATTR_NONALBUMTRACKS ],
+ [ &MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS ],
);
}
Modified: mb_server/branches/terminology/admin/reports/SuperfluousDataTracks
===================================================================
--- mb_server/branches/terminology/admin/reports/SuperfluousDataTracks 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/reports/SuperfluousDataTracks 2008-03-09 10:47:12 UTC (rev 9731)
@@ -32,13 +32,13 @@
package SuperfluousDataTracks;
use base qw( MusicBrainz::Server::ReportScript );
-use Album;
+use MusicBrainz::Server::Release;
sub GatherData
{
my $self = shift;
- $self->GatherDataFromQuery(<<'EOF', [ &Album::NONALBUMTRACKS_NAME ]);
+ $self->GatherDataFromQuery(<<'EOF', [ &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME ]);
SELECT
ar.id AS artist_id,
ar.name AS artist_name,
Modified: mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl
===================================================================
--- mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -34,7 +34,7 @@
use MusicBrainz::Server::Validation;
use Encode qw( decode );
-use Album;
+use MusicBrainz::Server::Release;
use Artist;
sub GatherData
@@ -71,7 +71,7 @@
push @{ $artists->{ $_->[0] }{ALBUMS}{ $_->[1] }{TRACKS} }, $_;
}
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
my $ar = Artist->new($self->{DBH});
for my $artistid (keys %$artists)
Modified: mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
===================================================================
--- mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -141,8 +141,8 @@
eval {
$sql->Begin;
- require Album;
- my $al = Album->new($mb->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId($id);
$al->LoadFromId or die "No album #$id";
Modified: mb_server/branches/terminology/admin/sql/updates/20060305-2.pl
===================================================================
--- mb_server/branches/terminology/admin/sql/updates/20060305-2.pl 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/sql/updates/20060305-2.pl 2008-03-09 10:47:12 UTC (rev 9731)
@@ -37,7 +37,7 @@
require DBDefs;
require MusicBrainz;
require Sql;
-require Album;
+require MusicBrainz::Server::Release;
my $verbose = 1;
@@ -71,7 +71,7 @@
my %done;
for my $link (@$rows)
{
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
my $alid = $link->{alid};
$al->SetId($alid);
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 10:47:12 UTC (rev 9731)
@@ -44,7 +44,7 @@
require DBDefs;
require ModDefs;
-require Album;
+require MusicBrainz::Server::Release;
require Alias;
require Artist;
require DebugLog;
Modified: mb_server/branches/terminology/htdocs/bare/cdlookup.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/cdlookup.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/bare/cdlookup.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -382,7 +382,7 @@
for my $releaseid (@$releaseids)
{
- my $release = Album->new($dbh);
+ my $release = MusicBrainz::Server::Release->new($dbh);
$release->SetId($releaseid);
$release->LoadFromId or next;
Modified: mb_server/branches/terminology/htdocs/bare/xget.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/xget.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/bare/xget.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -52,7 +52,7 @@
my ($out, @tracks);
$artist = Artist->new($mb->{DBH});
- $release = Album->new($mb->{DBH});
+ $release = MusicBrainz::Server::Release->new($mb->{DBH});
$di = MusicBrainz::Server::AlbumCDTOC->new($mb->{DBH});
my $releaseids = $di->GetAlbumIDsFromDiscID($discid);
Modified: mb_server/branches/terminology/htdocs/browsevarious.html
===================================================================
--- mb_server/branches/terminology/htdocs/browsevarious.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/browsevarious.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -63,13 +63,13 @@
# handle release type argument
MusicBrainz::Server::Validation::IsNonNegInteger($reltype) or $reltype = 0;
- $reltype >= Album::ALBUM_ATTR_SECTION_TYPE_START or $reltype = 0;
- $reltype <= Album::ALBUM_ATTR_SECTION_TYPE_END or $reltype = 0;
+ $reltype >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START or $reltype = 0;
+ $reltype <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END or $reltype = 0;
# handle release status argument
MusicBrainz::Server::Validation::IsNonNegInteger($relstatus) or $relstatus = 0;
- $relstatus >= Album::ALBUM_ATTR_SECTION_STATUS_START or $relstatus = 0;
- $relstatus <= Album::ALBUM_ATTR_SECTION_STATUS_END or $relstatus = 0;
+ $relstatus >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START or $relstatus = 0;
+ $relstatus <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END or $relstatus = 0;
# handle artists argument
$artists = ""
@@ -106,7 +106,7 @@
# load album list from the database.
my $mb = $m->comp("/comp/dblogin");
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId(&ModDefs::VARTIST_ID);
my ($num_albums, $albums) = $al->GetVariousDisplayList(
$index,
Modified: mb_server/branches/terminology/htdocs/comp/artisttitle
===================================================================
--- mb_server/branches/terminology/htdocs/comp/artisttitle 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/artisttitle 2008-03-09 10:47:12 UTC (rev 9731)
@@ -179,9 +179,9 @@
{
$m->out(sprintf qq! | <a href="/freedb/freedb.html?search=%s">Import release</a>!, uri_escape($name));
- require Album;
+ require MusicBrainz::Server::Release;
my $mb = $m->comp("/comp/dblogin");
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
if (my @non = $al->FindNonAlbum($id))
{
my $nonid = $non[0]->GetMBId;
Modified: mb_server/branches/terminology/htdocs/comp/browse/filtersbox
===================================================================
--- mb_server/branches/terminology/htdocs/comp/browse/filtersbox 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/browse/filtersbox 2008-03-09 10:47:12 UTC (rev 9731)
@@ -40,9 +40,9 @@
$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, Album::ALBUM_ATTR_SECTION_TYPE_START .. Album::ALBUM_ATTR_SECTION_TYPE_END)
+ for my $rt (0, MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
- my $name = ($rt ? Album->GetAttributeName($rt) : "All");
+ my $name = ($rt ? MusicBrainz::Server::Release->GetAttributeName($rt) : "All");
$m->out(" | ") if $rt;
$m->out(qq!<span class="selected">!)if $rt == $reltype;
$m->out(qq!<a href="/browsevarious.html?reltype=$rt&relstatus=$relstatus&artists=$artists&index=$index">$name</a>!);
@@ -51,9 +51,9 @@
$m->out(qq!</td></tr>!);
$m->out(qq!<tr><td class="left"><b>Release Status: </b></td><td class="left">!);
- for my $rt (0, Album::ALBUM_ATTR_SECTION_STATUS_START .. Album::ALBUM_ATTR_SECTION_STATUS_END)
+ for my $rt (0, MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
{
- my $name = ($rt ? Album->GetAttributeName($rt) : "All");
+ my $name = ($rt ? MusicBrainz::Server::Release->GetAttributeName($rt) : "All");
$m->out(" | ") if $rt;
$m->out(qq!<span class="selected">!) if $rt == $relstatus;
$m->out(qq!<a href="/browsevarious.html?reltype=$reltype&relstatus=$rt&artists=$artists&index=$index">$name</a>!);
Modified: mb_server/branches/terminology/htdocs/comp/loadrelease
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadrelease 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/loadrelease 2008-03-09 10:47:12 UTC (rev 9731)
@@ -57,7 +57,7 @@
$releaseid = $id if (MusicBrainz::Server::Validation::IsNonNegInteger($id) && $id);
# if the $id parameter is a GUID
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
if ($mbid ne "")
{
$release->SetMBId($mbid);
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM 2008-03-09 10:47:12 UTC (rev 9731)
@@ -41,7 +41,7 @@
(my $name) = grep { defined } ($new->{'AlbumName'}, "[error]");
(my $id) = grep { defined } (@$new{'AlbumId', '_albumid'}, 0);
- my $release = Album->new($this->{DBH});
+ my $release = MusicBrainz::Server::Release->new($this->{DBH});
$release->SetId($id);
my $exists = $release->LoadFromId;
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK 2008-03-09 10:47:12 UTC (rev 9731)
@@ -41,7 +41,7 @@
%# Dirty; really we should test the non-album bit of the album attribute.
%# but that would require another fetch.
-% unless ($this->GetPrev eq &Album::NONALBUMTRACKS_NAME) {
+% unless ($this->GetPrev eq &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME) {
<br />
Track: <strong><% $this->{'new.tracknum'} %></strong>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV 2008-03-09 10:47:12 UTC (rev 9731)
@@ -44,7 +44,7 @@
%# Dirty; really we should test the non-album bit of the album attribute.
%# but that would require another fetch.
-% unless ($this->GetPrev eq &Album::NONALBUMTRACKS_NAME)
+% unless ($this->GetPrev eq &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME)
% {
<tr>
<td class="lbl">Track #:</td>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS 2008-03-09 10:47:12 UTC (rev 9731)
@@ -42,7 +42,7 @@
% {
<tr>
<td class="lbl"><% $i++ == 0 ? "Old:" : "" %></td>
-% my ($type, $status) = map { Album->GetAttributeName($_) || "#$_" } split ',', $release->{prev};
+% my ($type, $status) = map { MusicBrainz::Server::Release->GetAttributeName($_) || "#$_" } split ',', $release->{prev};
<td class="field">Type: <% $type || '?' %>, Status: <% $status || '?' %></td>
<td class="field"> <& /comp/linkrelease, id => $release->{'id'}, name => $release->{'name'}, strong => 0 &></td>
</tr>
@@ -51,8 +51,8 @@
<td class="lbl">New:</td>
% my $new = $this->{'new_unpacked'};
% my ($type, $status) = map {
-% $_ ? (Album->GetAttributeName($_) || "#$_") : "?"
-% } Album->GetReleaseTypeAndStatus([ split /,/, $new->{Attributes} ]);
+% $_ ? (MusicBrainz::Server::Release->GetAttributeName($_) || "#$_") : "?"
+% } MusicBrainz::Server::Release->GetReleaseTypeAndStatus([ split /,/, $new->{Attributes} ]);
<td class="field">Type: <% $type || '?' %>, Status: <% $status || '?' %></td>
</tr>
</table>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM 2008-03-09 10:47:12 UTC (rev 9731)
@@ -50,7 +50,7 @@
for my $releasehash (@$releases)
{
my ($releaseexists, $artistexists) = (0, 0);
- my ($release, $artist) = (Album->new($this->{DBH}), Artist->new($this->{DBH}));
+ my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), Artist->new($this->{DBH}));
$release->SetId($releasehash->{'id'});
if ($releaseexists = $release->LoadFromId())
@@ -94,7 +94,7 @@
<%perl>
my ($releaseexists, $artistexists) = (0, 0);
- my ($release, $artist) = (Album->new($this->{DBH}), Artist->new($this->{DBH}));
+ my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), Artist->new($this->{DBH}));
$release->SetId($into->{'id'});
if ($releaseexists = $release->LoadFromId())
{
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_DISCID
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_DISCID 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_DISCID 2008-03-09 10:47:12 UTC (rev 9731)
@@ -60,7 +60,7 @@
<%perl>
my ($releaseexists, $artistexists) = (0, 0);
- my ($release, $artist) = (Album->new($this->{DBH}), Artist->new($this->{DBH}));
+ my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), Artist->new($this->{DBH}));
$release->SetId($this->GetPrev);
if ($releaseexists = $release->LoadFromId())
{
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes 2008-03-09 10:47:12 UTC (rev 9731)
@@ -52,14 +52,14 @@
}
# guess release attributes from most common factors
- $ARGS{"attr_status_guessed"} = Album::ALBUM_ATTR_OFFICIAL;
+ $ARGS{"attr_status_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL;
- $ARGS{"attr_type_guessed"} = Album::ALBUM_ATTR_ALBUM;
- $ARGS{"attr_type_guessed"} = Album::ALBUM_ATTR_COMPILATION
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM;
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION
if $hasmultipletrackartists;
- $ARGS{"attr_type_guessed"} = Album::ALBUM_ATTR_SINGLE
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_SINGLE
if ($disclength ? ($disclength < 30*60*1000) : ($tracks <= 5));
- $ARGS{"attr_type_guessed"} = Album::ALBUM_ATTR_EP
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_EP
if $releasename =~ /\bEP\b/i;
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-09 10:47:12 UTC (rev 9731)
@@ -78,7 +78,7 @@
sub => sub {
my @insertededits;
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId($releaseid);
$release->LoadFromId
or die "Error loading release\n";
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes 2008-03-09 10:47:12 UTC (rev 9731)
@@ -61,9 +61,9 @@
[ "-1", "Select type..." ],
[ "" , "I don't know" ],
(map {
- [ $_, Album->GetAttributeName($_) ]
- } &Album::ALBUM_ATTR_SECTION_TYPE_START
- .. &Album::ALBUM_ATTR_SECTION_TYPE_END)
+ [ $_, MusicBrainz::Server::Release->GetAttributeName($_) ]
+ } &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START
+ .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
]
},
$attr_type
@@ -77,9 +77,9 @@
[ "-1", "Select status..." ],
[ "" , "I don't know" ],
(map {
- [ $_, Album->GetAttributeName($_) ]
- } &Album::ALBUM_ATTR_SECTION_STATUS_START
- .. &Album::ALBUM_ATTR_SECTION_STATUS_END)
+ [ $_, MusicBrainz::Server::Release->GetAttributeName($_) ]
+ } &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START
+ .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
]
},
$attr_status
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/init-editall 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/init-editall 2008-03-09 10:47:12 UTC (rev 9731)
@@ -39,7 +39,7 @@
# LOAD RELEASE
# ---------------------------------------------------------------
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId($releaseid);
$release->SetMBId($mbid)
if ($mbid ne "");
@@ -54,7 +54,7 @@
# disallow editing the NAT-album
if ($release->IsNonAlbumTracks)
{
- $ARGS{"init-editall-error"} = sprintf "The 'Edit Release' feature cannot edit '%s'", &Album::NONALBUMTRACKS_NAME;
+ $ARGS{"init-editall-error"} = sprintf "The 'Edit Release' feature cannot edit '%s'", &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME;
return %ARGS;
}
$orig{"releaseid"} = $release->GetId;
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-09 10:47:12 UTC (rev 9731)
@@ -76,7 +76,7 @@
my $artist = &$GetCachedArtist($artistid);
# prepare release object
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId(0);
# Hack. Maybe $release->SetAlbumMeta(...) would be a better method
$release->{trackcount} = 0;
@@ -405,7 +405,7 @@
for ($ov, $nv)
{
my @names = map {
- Album->GetAttributeName($_) || "Not_set"
+ MusicBrainz::Server::Release->GetAttributeName($_) || "Not_set"
} split ',', $_;
my $type = ($_ eq $ov ? "Old: " : "New: ");
push @attrvalues, (@names ? join ", ", @names : "None");
Modified: mb_server/branches/terminology/htdocs/edit/album/attrform
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-09 10:47:12 UTC (rev 9731)
@@ -46,7 +46,7 @@
</%args>
<%perl>
- my $attrlist = Album->GetAttributeList();
+ my $attrlist = MusicBrainz::Server::Release->GetAttributeList();
my @indexes;
</%perl>
@@ -100,13 +100,13 @@
$m->out(qq!</td><td style="padding-right: 20px">!);
$m->out(
defined $type
- ? Album->GetAttributeName($type)
+ ? MusicBrainz::Server::Release->GetAttributeName($type)
: "Not Set");
$m->out(qq!</td><td>!);
$m->out(
defined $status
- ? Album->GetAttributeName($status)
+ ? MusicBrainz::Server::Release->GetAttributeName($status)
: "Not Set");
$m->out("</td></tr>");
}
@@ -138,7 +138,7 @@
label => "Release type",
selection => $type_value,
fieldname => $type_fieldname,
- valuelist => [ &Album::ALBUM_ATTR_SECTION_TYPE_START .. &Album::ALBUM_ATTR_SECTION_TYPE_END ],
+ valuelist => [ &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END ],
attrlist => $attrlist,
pushindex => \@indexes,
&>
@@ -147,7 +147,7 @@
label => "Release status",
selection => $status_value,
fieldname => $status_fieldname,
- valuelist => [ &Album::ALBUM_ATTR_SECTION_STATUS_START .. &Album::ALBUM_ATTR_SECTION_STATUS_END ],
+ valuelist => [ &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END ],
attrlist => $attrlist,
pushindex => \@indexes,
&>
Modified: mb_server/branches/terminology/htdocs/edit/album/editattributes.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/editattributes.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/edit/album/editattributes.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -116,7 +116,7 @@
for $release->GetAttributes;
}
my @attrs = sort { $a<=>$b } keys %attrs;
- my ($type, $status) = Album->GetReleaseTypeAndStatus(\@attrs);
+ my ($type, $status) = MusicBrainz::Server::Release->GetReleaseTypeAndStatus(\@attrs);
my @focus_to;
Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/index.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/index.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -53,7 +53,7 @@
$release->IsNonAlbumTracks
and return $m->comp(
"/comp/error",
- "The 'Edit Release Events' feature cannot edit '".&Album::NONALBUMTRACKS_NAME."'",
+ "The 'Edit Release Events' feature cannot edit '".&MusicBrainz::Server::Release::NONALBUMTRACKS_NAME."'",
1, 1,
);
Modified: mb_server/branches/terminology/htdocs/edit/discid/move.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -161,7 +161,7 @@
while (my $row = $eng->NextRow)
{
- my $newrelease = Album->new($mb->{DBH});
+ my $newrelease = MusicBrainz::Server::Release->new($mb->{DBH});
$newrelease->SetId($row->{'albumid'});
# Get data for the current candidate
Modified: mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -112,7 +112,7 @@
# find non-album tracks release, else
# redirect to artist page after the required
# action given by submitvalue was performed.
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
my $url = "/artist/".$artist->GetMBId.".html";
if (my @non = $release->FindNonAlbum($artistid))
{
Modified: mb_server/branches/terminology/htdocs/freedb/review.html
===================================================================
--- mb_server/branches/terminology/htdocs/freedb/review.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/freedb/review.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -74,7 +74,7 @@
$artist->SetId(0);
$artist->SetName($artistname);
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId(0);
$release->SetArtist(0);
$release->SetName($releasename);
@@ -195,7 +195,7 @@
$artist->SetId(1);
$artist->SetName("Various Artists");
- $release = Album->new($mb->{DBH});
+ $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId(-2);
$release->SetArtist(&ModDefs::VARTIST_ID);
$release->SetName($releasename);
Modified: mb_server/branches/terminology/htdocs/reports/show_album_duplicates.inc
===================================================================
--- mb_server/branches/terminology/htdocs/reports/show_album_duplicates.inc 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/reports/show_album_duplicates.inc 2008-03-09 10:47:12 UTC (rev 9731)
@@ -39,7 +39,7 @@
</%args>
<%perl>
- use Album;
+ use MusicBrainz::Server::Release;
use Artist;
use MusicBrainz::Server::PagedReport;
use File::Basename qw(dirname);
@@ -114,7 +114,7 @@
# read album and artist information if the album exists
foreach my $entry (@$dupelist)
{
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetMBId($entry->{album_mbid});
if ($al->LoadFromId(1))
{
Modified: mb_server/branches/terminology/htdocs/reports/show_full_albums.inc
===================================================================
--- mb_server/branches/terminology/htdocs/reports/show_full_albums.inc 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/reports/show_full_albums.inc 2008-03-09 10:47:12 UTC (rev 9731)
@@ -107,7 +107,7 @@
for my $album ( values %{ $artist->{ALBUMS} } )
{
- my $al = new Album($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId($album->{ID});
$al->LoadFromId();
Modified: mb_server/branches/terminology/htdocs/show/artist/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/artist/index.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/show/artist/index.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -93,11 +93,11 @@
for my $attr ($a->GetAttributes)
{
- $a->{_attr_type} = $attr if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END);
- $a->{_attr_status} = $attr if ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END);
- $a->{_attr_type} = $attr if ($attr == Album::ALBUM_ATTR_NONALBUMTRACKS);
+ $a->{_attr_type} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END);
+ $a->{_attr_status} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END);
+ $a->{_attr_type} = $attr if ($attr == MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS);
}
# The "actual values", used for display
@@ -105,8 +105,8 @@
$a->{_actual_attr_status} = $a->{_attr_status};
# Used for sorting
- $a->{_attr_type} = Album::ALBUM_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
- $a->{_attr_status} = Album::ALBUM_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
+ $a->{_attr_type} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
+ $a->{_attr_status} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
};
# Sort by:
@@ -231,10 +231,10 @@
for my $album (@albums)
{
my ($type, $status) = $album->GetReleaseTypeAndStatus();
- push @shortlist, $album if ($type == &Album::ALBUM_ATTR_ALBUM ||
- $type == &Album::ALBUM_ATTR_EP ||
- $type == &Album::ALBUM_ATTR_COMPILATION ||
- $type == &Album::ALBUM_ATTR_SINGLE);
+ push @shortlist, $album if ($type == &MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM ||
+ $type == &MusicBrainz::Server::Release::ALBUM_ATTR_EP ||
+ $type == &MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION ||
+ $type == &MusicBrainz::Server::Release::ALBUM_ATTR_SINGLE);
}
if (scalar(@shortlist))
{
@@ -298,7 +298,7 @@
$album->SetMultipleTrackArtists($album->GetArtist != $artist->GetId() ? 1 : 0);
$album->{_is_va_} = ($album->GetArtist == &ModDefs::VARTIST_ID or
$album->GetArtist != $artist->GetId());
- $album->{_is_nonalbum_} = ($album->{_attr_type} == Album::ALBUM_ATTR_NONALBUMTRACKS);
+ $album->{_is_nonalbum_} = ($album->{_attr_type} == MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS);
$album->{_section_key_} = (
$album->{_is_va_} . " " . $album->{_attr_type}
Modified: mb_server/branches/terminology/htdocs/show/label/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/label/index.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/show/label/index.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -79,11 +79,11 @@
for my $attr ($a->GetAttributes)
{
- $a->{_attr_type} = $attr if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END);
- $a->{_attr_status} = $attr if ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END);
- $a->{_attr_type} = $attr if ($attr == Album::ALBUM_ATTR_NONALBUMTRACKS);
+ $a->{_attr_type} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END);
+ $a->{_attr_status} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END);
+ $a->{_attr_type} = $attr if ($attr == MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS);
}
# The "actual values", used for display
@@ -91,8 +91,8 @@
$a->{_actual_attr_status} = $a->{_attr_status};
# Used for sorting
- $a->{_attr_type} = Album::ALBUM_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
- $a->{_attr_status} = Album::ALBUM_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
+ $a->{_attr_type} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
+ $a->{_attr_status} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
};
my $SortAlbums;
Modified: mb_server/branches/terminology/htdocs/show/puid/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/puid/index.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/show/puid/index.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -42,7 +42,7 @@
my $mb = $m->comp("/comp/dblogin");
my $artist = Artist->new($mb->{DBH});
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
my $pweed = PUID->new($mb->{DBH});
my $ids;
@@ -119,7 +119,7 @@
for my $releaseid (@releases)
{
$releases{$releaseid} ||= do {
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId($releaseid);
$release->LoadFromId
or $release = "0 but true"; # load failed
Modified: mb_server/branches/terminology/htdocs/show/track/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -140,12 +140,12 @@
{
for (@info)
{
- my $album = Album->new($mb->{DBH});
+ my $album = MusicBrainz::Server::Release->new($mb->{DBH});
$album->SetId($_->[0]);
$album->SetName($_->[1]);
$album->SetMBId($_->[3]);
- # FIXME need API in Album.pm
+ # FIXME need API in Release.pm
$album->{attrs} = [ $_->[4] =~ /(\d+)/g ];
$m->comp(
Modified: mb_server/branches/terminology/htdocs/show/track/relationships.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/track/relationships.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/show/track/relationships.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -71,12 +71,12 @@
{
for (@info)
{
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId($_->[0]);
$release->SetName($_->[1]);
$release->SetMBId($_->[3]);
- # FIXME need API in Album.pm
+ # FIXME need API in Release.pm
$release->{attrs} = [ $_->[4] =~ /(\d+)/g ];
$m->comp("/comp/albuminfo",
album => $release,
Modified: mb_server/branches/terminology/htdocs/show/trm/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/trm/index.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/show/trm/index.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -42,7 +42,7 @@
my $mb = $m->comp("/comp/dblogin");
my $artist = Artist->new($mb->{DBH});
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
my $gu = TRM->new($mb->{DBH});
my $ids;
@@ -139,7 +139,7 @@
for my $releaseid (@releases)
{
$releases{$releaseid} ||= do {
- my $release = Album->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{DBH});
$release->SetId($releaseid);
$release->LoadFromId
or $release = "0 but true"; # load failed
Modified: mb_server/branches/terminology/htdocs/taglookup.html
===================================================================
--- mb_server/branches/terminology/htdocs/taglookup.html 2008-03-09 10:25:32 UTC (rev 9730)
+++ mb_server/branches/terminology/htdocs/taglookup.html 2008-03-09 10:47:12 UTC (rev 9731)
@@ -96,7 +96,7 @@
# Retrieve artist info, then sort on artist
foreach my $ref (@coll_list)
{
- my $al = Album->new($ts->{DBH});
+ my $al = MusicBrainz::Server::Release->new($ts->{DBH});
$al->SetId($ref->{album});
if ($al->LoadFromId())
{
@@ -177,7 +177,7 @@
# Retrieve artist info, then sort on artist
foreach my $ref (@pcoll_list)
{
- my $al = Album->new($ts->{DBH});
+ my $al = MusicBrainz::Server::Release->new($ts->{DBH});
$al->SetId($ref->{album});
if ($al->LoadFromId())
{
More information about the MusicBrainz-commits
mailing list