[mb-commits] r9732 - in mb_server/branches/terminology: admin admin/ar admin/cleanup admin/reports admin/sql/updates cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs htdocs/bare htdocs/cdi htdocs/comp htdocs/comp/moderation htdocs/comp/release_editor htdocs/edit/album htdocs/edit/albumbatch htdocs/edit/albumreleases htdocs/edit/artist htdocs/edit/discid htdocs/edit/label htdocs/freedb htdocs/mod/search htdocs/reports htdocs/show/artist htdocs/show/edit htdocs/show/label htdocs/show/puid htdocs/show/trm htdocs/user
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 12:59:07 UTC 2008
Author: luks
Date: 2008-03-09 12:59:06 +0000 (Sun, 09 Mar 2008)
New Revision: 9732
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm
Removed:
mb_server/branches/terminology/cgi-bin/Artist.pm
mb_server/branches/terminology/cgi-bin/Label.pm
Modified:
mb_server/branches/terminology/admin/RDFDump.pl
mb_server/branches/terminology/admin/ar/ImportLinks
mb_server/branches/terminology/admin/cleanup/EmptyArtists.pl
mb_server/branches/terminology/admin/cleanup/SanityCheck.pl
mb_server/branches/terminology/admin/cleanup/SmartQuotes
mb_server/branches/terminology/admin/reports/AlbumsToConvert.inc
mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl
mb_server/branches/terminology/admin/reports/DuplicateAlbums
mb_server/branches/terminology/admin/reports/DuplicateArtists.inc
mb_server/branches/terminology/admin/reports/DuplicateArtists2
mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl
mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
mb_server/branches/terminology/admin/startup.pl.default
mb_server/branches/terminology/cgi-bin/Alias.pm
mb_server/branches/terminology/cgi-bin/FreeDB.pm
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/MM.pm
mb_server/branches/terminology/cgi-bin/MM_2_1.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.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/Label.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/Handlers/WS/1/Track.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/User.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_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.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_ARTIST_QUALITY.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.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_MERGE_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.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_TRMID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.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
mb_server/branches/terminology/cgi-bin/Track.pm
mb_server/branches/terminology/htdocs/bare/cdlookup.html
mb_server/branches/terminology/htdocs/bare/xget.html
mb_server/branches/terminology/htdocs/browseartists.html
mb_server/branches/terminology/htdocs/browselabels.html
mb_server/branches/terminology/htdocs/cdi/enter.html
mb_server/branches/terminology/htdocs/comp/artisttitle
mb_server/branches/terminology/htdocs/comp/labeltitle
mb_server/branches/terminology/htdocs/comp/loadartist
mb_server/branches/terminology/htdocs/comp/loadlabel
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ARTIST
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_LABEL
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ARTIST
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_LABEL
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MAC_TO_SAC
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ARTIST
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_LABEL
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_DISCID
mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS
mb_server/branches/terminology/htdocs/comp/moderation/MOD_SAC_TO_MAC
mb_server/branches/terminology/htdocs/comp/release_editor/check-artists
mb_server/branches/terminology/htdocs/comp/release_editor/check-labels
mb_server/branches/terminology/htdocs/comp/release_editor/convert-moverelease
mb_server/branches/terminology/htdocs/comp/release_editor/convert-tosac
mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
mb_server/branches/terminology/htdocs/edit/album/add.html
mb_server/branches/terminology/htdocs/edit/albumbatch/done.html
mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html
mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html
mb_server/branches/terminology/htdocs/edit/artist/add.html
mb_server/branches/terminology/htdocs/edit/artist/edit.html
mb_server/branches/terminology/htdocs/edit/artist/main-form
mb_server/branches/terminology/htdocs/edit/artist/strict.html
mb_server/branches/terminology/htdocs/edit/discid/move.html
mb_server/branches/terminology/htdocs/edit/label/add.html
mb_server/branches/terminology/htdocs/edit/label/edit.html
mb_server/branches/terminology/htdocs/edit/label/main-form
mb_server/branches/terminology/htdocs/freedb/review.html
mb_server/branches/terminology/htdocs/mod/search/setquery.inc
mb_server/branches/terminology/htdocs/reports/show_album_duplicates.inc
mb_server/branches/terminology/htdocs/reports/show_artist_duplicates.inc
mb_server/branches/terminology/htdocs/reports/show_full_albums.inc
mb_server/branches/terminology/htdocs/show/artist/subscriptions.html
mb_server/branches/terminology/htdocs/show/edit/conditions.html
mb_server/branches/terminology/htdocs/show/label/subscriptions.html
mb_server/branches/terminology/htdocs/show/puid/index.html
mb_server/branches/terminology/htdocs/show/trm/index.html
mb_server/branches/terminology/htdocs/taglookup.html
mb_server/branches/terminology/htdocs/user/subscribe.html
Log:
Move Artist and Label to MusicBrainz::Server
Modified: mb_server/branches/terminology/admin/RDFDump.pl
===================================================================
--- mb_server/branches/terminology/admin/RDFDump.pl 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/RDFDump.pl 2008-03-09 12:59:06 UTC (rev 9732)
@@ -31,7 +31,7 @@
use Sql;
use MusicBrainz;
use MM_2_1;
-use Artist;
+use MusicBrainz::Server::Artist;
use MusicBrainz::Server::Release;
use Track;
Modified: mb_server/branches/terminology/admin/ar/ImportLinks
===================================================================
--- mb_server/branches/terminology/admin/ar/ImportLinks 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/ar/ImportLinks 2008-03-09 12:59:06 UTC (rev 9732)
@@ -31,7 +31,7 @@
use Sql;
use Data::Dumper;
use MusicBrainz;
-use Artist;
+use MusicBrainz::Server::Artist;
my $mb = MusicBrainz->new;
$mb->Login;
@@ -51,8 +51,8 @@
$rel =~ s/^\s*|\s*$//g;
#print "$ent0 $ent1 $rel\n";
- my $ar0 = Artist->new($mb->{DBH});
- my $ar1 = Artist->new($mb->{DBH});
+ my $ar0 = MusicBrainz::Server::Artist->new($mb->{DBH});
+ my $ar1 = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar0->SetMBId($ent0);
$ar1->SetMBId($ent1);
Modified: mb_server/branches/terminology/admin/cleanup/EmptyArtists.pl
===================================================================
--- mb_server/branches/terminology/admin/cleanup/EmptyArtists.pl 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/cleanup/EmptyArtists.pl 2008-03-09 12:59:06 UTC (rev 9732)
@@ -230,8 +230,8 @@
eval
{
- use Artist;
- my $ar = Artist->new($sqlWrite->{DBH});
+ use MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{DBH});
# No need to load the whole record, hopefully...
$ar->SetId($id);
Modified: mb_server/branches/terminology/admin/cleanup/SanityCheck.pl
===================================================================
--- mb_server/branches/terminology/admin/cleanup/SanityCheck.pl 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/cleanup/SanityCheck.pl 2008-03-09 12:59:06 UTC (rev 9732)
@@ -30,7 +30,7 @@
use lib "$FindBin::Bin/../../cgi-bin";
use DBDefs;
-use Artist;
+use MusicBrainz::Server::Artist;
use ModDefs ':modstatus', 'DARTIST_ID';
use MusicBrainz;
Modified: mb_server/branches/terminology/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 12:59:06 UTC (rev 9732)
@@ -184,8 +184,8 @@
# Hence, we need to check for name clashes, then check for
# open "merge" mods, and not add the mod if it's already
# there.
- require Artist;
- my $ar = Artist->new($sqlWrite->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{DBH});
$ar->SetId($id);
$ar->SetName(encode "utf-8", $oname);
$ar->SetSortName(encode "utf-8", $oname);
Modified: mb_server/branches/terminology/admin/reports/AlbumsToConvert.inc
===================================================================
--- mb_server/branches/terminology/admin/reports/AlbumsToConvert.inc 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/reports/AlbumsToConvert.inc 2008-03-09 12:59:06 UTC (rev 9732)
@@ -101,7 +101,7 @@
if ($row->{artist_id} != $lastartist)
{
- my $ar = Artist->new(undef);
+ my $ar = MusicBrainz::Server::Artist->new(undef);
$ar->SetId($row->{artist_id});
$ar->SetMBId($row->{artist_mbid});
$ar->SetName($row->{artist_name});
Modified: mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl
===================================================================
--- mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/reports/AlbumsToConvert.pl 2008-03-09 12:59:06 UTC (rev 9732)
@@ -33,7 +33,7 @@
use base qw( MusicBrainz::Server::ReportScript );
use MusicBrainz::Server::Release;
-use Artist;
+use MusicBrainz::Server::Artist;
sub GatherData
{
@@ -93,7 +93,7 @@
unless ($ar)
{
- $ar = Artist->new($self->DBH);
+ $ar = MusicBrainz::Server::Artist->new($self->DBH);
$ar->SetId($al->GetArtist);
$ar->LoadFromId or next;
Modified: mb_server/branches/terminology/admin/reports/DuplicateAlbums
===================================================================
--- mb_server/branches/terminology/admin/reports/DuplicateAlbums 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/reports/DuplicateAlbums 2008-03-09 12:59:06 UTC (rev 9732)
@@ -26,7 +26,7 @@
use FindBin;
use lib "$FindBin::Bin/../../cgi-bin";
use MusicBrainz::Server::Release;
-use Artist;
+use MusicBrainz::Server::Artist;
use strict;
use warnings;
@@ -97,7 +97,7 @@
my $ar;
if (not exists $artists{ $al->GetArtist })
{
- $ar = Artist->new($self->DBH);
+ $ar = MusicBrainz::Server::Artist->new($self->DBH);
$ar->SetId($al->GetArtist);
unless ($ar->LoadFromId)
{
Modified: mb_server/branches/terminology/admin/reports/DuplicateArtists.inc
===================================================================
--- mb_server/branches/terminology/admin/reports/DuplicateArtists.inc 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/reports/DuplicateArtists.inc 2008-03-09 12:59:06 UTC (rev 9732)
@@ -37,7 +37,7 @@
</%args>
<%perl>
- use Artist;
+ use MusicBrainz::Server::Artist;
use MusicBrainz::Server::PagedReport;
use File::Basename qw( dirname );
@@ -110,7 +110,7 @@
% my $j = 0;
% foreach my $row ( @$dupelist )
% {
-% my $ar = Artist->new($mb->{DBH});
+% my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
% $ar->SetId( $row->{artist_id} );
% $ar->LoadFromId();
Modified: mb_server/branches/terminology/admin/reports/DuplicateArtists2
===================================================================
--- mb_server/branches/terminology/admin/reports/DuplicateArtists2 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/reports/DuplicateArtists2 2008-03-09 12:59:06 UTC (rev 9732)
@@ -32,7 +32,7 @@
package DuplicateArtists2;
use base qw(MusicBrainz::Server::ReportScript);
-use Artist;
+use MusicBrainz::Server::Artist;
sub GatherData
@@ -67,7 +67,7 @@
my @entry;
foreach my $artist (@$artists)
{
- my $ar = Artist->new($self->DBH);
+ my $ar = MusicBrainz::Server::Artist->new($self->DBH);
$ar->SetMBId($artist->{artist_mbid});
next unless $ar->LoadFromId;
Modified: mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl
===================================================================
--- mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/reports/TracksNamedWithSequence.pl 2008-03-09 12:59:06 UTC (rev 9732)
@@ -35,7 +35,7 @@
use MusicBrainz::Server::Validation;
use Encode qw( decode );
use MusicBrainz::Server::Release;
-use Artist;
+use MusicBrainz::Server::Artist;
sub GatherData
{
@@ -72,7 +72,7 @@
}
my $al = MusicBrainz::Server::Release->new($self->{DBH});
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::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:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 12:59:06 UTC (rev 9732)
@@ -66,15 +66,15 @@
eval {
$sql->Begin;
- require Artist;
- my $ar = Artist->new($mb->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($id);
$ar->LoadFromId or die "No artist #$id";
unless ($name eq $_->[1])
{
# Is there already an artist with the new name?
- my $mergeinto = Artist->new($mb->{DBH});
+ my $mergeinto = MusicBrainz::Server::Artist->new($mb->{DBH});
if ($mergeinto->LoadFromName($name) and $mergeinto->GetName eq $name)
{
# Merge $ar into $mergeinto
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 12:59:06 UTC (rev 9732)
@@ -46,11 +46,11 @@
require MusicBrainz::Server::Release;
require Alias;
-require Artist;
+require MusicBrainz::Server::Artist;
require DebugLog;
require FreeDB;
require Insert;
-require Label;
+require MusicBrainz::Server::Label;
require LocaleSaver;
# require MM;
# require MM_2_0;
Modified: mb_server/branches/terminology/cgi-bin/Alias.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Alias.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/Alias.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -187,8 +187,8 @@
if ($table eq "artistalias")
{
# Update the search engine
- require Artist;
- my $artist = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $artist = MusicBrainz::Server::Artist->new($self->{DBH});
$artist->SetId($rowid);
$artist->LoadFromId;
$artist->RebuildWordList;
@@ -344,8 +344,8 @@
sub ParentClass
{
my $this = shift;
- return "Artist" if lc($this->{table}) eq "artistalias";
- return "Label" if lc($this->{table}) eq "labelalias";
+ return "MusicBrainz::Server::Artist" if lc($this->{table}) eq "artistalias";
+ return "MusicBrainz::Server::Label" if lc($this->{table}) eq "labelalias";
die "Don't understand Alias where table = $this->{table}";
}
Deleted: mb_server/branches/terminology/cgi-bin/Artist.pm
Modified: mb_server/branches/terminology/cgi-bin/FreeDB.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -367,9 +367,9 @@
$info->{sortname} = $st->MakeDefaultSortname($info->{artist});
require Alias;
- require Artist;
+ require MusicBrainz::Server::Artist;
$alias = Alias->new($this->{DBH});
- $ar = Artist->new($this->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
# Check to see if the artist has an alias.
$alias->{table} = "ArtistAlias";
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -207,9 +207,9 @@
die "Insert failed: you cannot force a new album and provide an albumid.\n";
}
- require Artist;
- my $ar = Artist->new($this->{DBH});
- my $mar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
+ my $mar = MusicBrainz::Server::Artist->new($this->{DBH});
require MusicBrainz::Server::Release;
my $al = MusicBrainz::Server::Release->new($this->{DBH});
require Track;
Deleted: mb_server/branches/terminology/cgi-bin/Label.pm
Modified: mb_server/branches/terminology/cgi-bin/MM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -143,8 +143,8 @@
$tr->SetMBId($id);
$tr->LoadFromId();
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($tr->GetArtist());
# TODO This is complaining about the ID being undef
$ar->LoadFromId();
@@ -197,8 +197,8 @@
$al->SetMBId($id);
$al->LoadFromId(1);
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($al->GetArtist);
$ar->LoadFromId;
$this->AddToCache(0, 'artist', $ar);
@@ -214,7 +214,7 @@
{
if ($is_va)
{
- my $var = Artist->new($this->{DBH});
+ my $var = MusicBrainz::Server::Artist->new($this->{DBH});
$var->SetId($tr->GetArtist);
if ($var->LoadFromId)
{
@@ -451,8 +451,8 @@
}
elsif ($type eq 'artist')
{
- require Artist;
- $obj = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $obj = MusicBrainz::Server::Artist->new($this->{DBH});
}
elsif ($type eq 'album')
{
Modified: mb_server/branches/terminology/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -85,7 +85,7 @@
$out .= $this->Element("dc:comment", $artist->GetResolution) if ($artist->GetResolution);
$out .= $this->Element("mm:artistType", "", "rdf:resource", $this->GetMMNamespace() .
- "Type" . &Artist::GetTypeName($artist->GetType)) if ($artist->GetType);
+ "Type" . &MusicBrainz::Server::Artist::GetTypeName($artist->GetType)) if ($artist->GetType);
$out .= $this->OutputRelationships($ref->{_relationships})
if (exists $ref->{_relationships});
@@ -576,8 +576,8 @@
{
my $artist;
- require Artist;
- $artist = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($tr->GetArtist());
$artist->LoadFromId();
$this->AddToCache(0, 'artist', $artist);
@@ -796,7 +796,7 @@
my ($type, $id) = split '-', $item;
if ($type eq 'artist')
{
- $temp = Artist->new($this->{DBH});
+ $temp = MusicBrainz::Server::Artist->new($this->{DBH});
$temp->SetId($id);
die if (!$temp->LoadFromId());
$out .= $this->OutputArtistRDF({ obj=> $temp });
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -1386,7 +1386,7 @@
$sql->Finish;
# Fetch artists, and cache by artistid.
- require Artist;
+ require MusicBrainz::Server::Artist;
my %artist_cache;
# Cache editors by name
@@ -1411,7 +1411,7 @@
my $artistid = $edit->GetArtist;
if (not defined $artist_cache{$artistid})
{
- my $artist = Artist->new($this->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($artistid);
if ($artist->LoadFromId())
{
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm (from rev 9731, mb_server/branches/terminology/cgi-bin/Artist.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -30,7 +30,7 @@
use Carp qw( croak );
use base qw( TableBase );
-require Artist;
+require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
require Track;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -119,9 +119,9 @@
require MusicBrainz;
my $mb = MusicBrainz->new;
$mb->Login;
- require Artist;
+ require MusicBrainz::Server::Artist;
- $ar = Artist->new($mb->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetMBId($mbid);
return undef unless $ar->LoadFromId(1);
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -302,7 +302,7 @@
my ($ar, $inc, $info) = @_;
printf '<artist id="%s"', $ar->GetMBId;
- printf ' type="%s"', &Artist::GetTypeName($ar->GetType()) if ($ar->GetType);
+ printf ' type="%s"', &MusicBrainz::Server::Artist::GetTypeName($ar->GetType()) if ($ar->GetType);
printf '><name>%s</name><sort-name>%s</sort-name>',
xml_escape($ar->GetName),
xml_escape($ar->GetSortName);
@@ -469,7 +469,7 @@
if (($inc & INC_LABELS) && $rel->GetLabel)
{
print '>';
- my $label = Label->new($rel->{DBH});
+ my $label = MusicBrainz::Server::Label->new($rel->{DBH});
$label->SetId($rel->GetLabel);
$label->SetMBId($rel->GetLabelMBId);
$label->SetName($rel->GetLabelName);
@@ -543,7 +543,7 @@
if ($ar->GetId != $tr->GetArtist)
{
my $ar;
- $ar = Artist->new($tr->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($tr->{DBH});
$ar->SetId($tr->GetArtist);
$ar->LoadFromId();
xml_track($ar, $tr, $tr_inc);
@@ -628,7 +628,7 @@
printf '<label id="%s"', $ar->GetMBId;
if ($ar->GetType)
{
- my $name = &Label::GetTypeName($ar->GetType());
+ my $name = &MusicBrainz::Server::Label::GetTypeName($ar->GetType());
$name =~ s/(^|[^A-Za-z0-9])+([A-Za-z0-9]?)/uc $2/eg;
printf ' type="%s"', $name;
}
@@ -704,7 +704,7 @@
}
else
{
- my $temp = Artist->new($dbh);
+ my $temp = MusicBrainz::Server::Artist->new($dbh);
MusicBrainz::Server::Validation::IsGUID($id) ? $temp->SetMBId($id) : $temp->SetId($id);
die "Could not load artist $id\n" if (!$temp->LoadFromId());
$cache->{$k} = $temp;
@@ -720,7 +720,7 @@
}
else
{
- my $temp = Label->new($dbh);
+ my $temp = MusicBrainz::Server::Label->new($dbh);
MusicBrainz::Server::Validation::IsGUID($id) ? $temp->SetMBId($id) : $temp->SetId($id);
die "Could not load label $id\n" if (!$temp->LoadFromId());
$cache->{$k} = $temp;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -117,9 +117,9 @@
require MusicBrainz;
my $mb = MusicBrainz->new;
$mb->Login;
- require Label;
+ require MusicBrainz::Server::Label;
- $ar = Label->new($mb->{DBH});
+ $ar = MusicBrainz::Server::Label->new($mb->{DBH});
$ar->SetMBId($mbid);
return undef unless $ar->LoadFromId(1);
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -179,7 +179,7 @@
if (@albums && !$ar && $inc & INC_ARTIST || $inc & INC_TRACKS)
{
- $ar = Artist->new($mb->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($al->GetArtist);
$ar->LoadFromId();
}
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -182,15 +182,15 @@
require Sql;
my $sql = Sql->new($mb->{DBH});
- require Artist;
+ require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
- require Label;
+ require MusicBrainz::Server::Label;
require Track;
my $obj;
if ($entity eq 'artist')
{
- $obj = Artist->new($sql->{DBH});
+ $obj = MusicBrainz::Server::Artist->new($sql->{DBH});
}
elsif ($entity eq 'release')
{
@@ -202,7 +202,7 @@
}
elsif ($entity eq 'label')
{
- $obj = Label->new($sql->{DBH});
+ $obj = MusicBrainz::Server::Label->new($sql->{DBH});
}
$obj->SetMBId($id);
unless ($obj->LoadFromId)
@@ -230,15 +230,15 @@
my $user = UserStuff->new($maindb->{DBH});
$user = $user->newFromName($user_name) or die "Cannot load user.\n";
- require Artist;
+ require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
- require Label;
+ require MusicBrainz::Server::Label;
require Track;
my $obj;
if ($entity_type eq 'artist')
{
- $obj = Artist->new($maindb->{DBH});
+ $obj = MusicBrainz::Server::Artist->new($maindb->{DBH});
}
elsif ($entity_type eq 'release')
{
@@ -250,7 +250,7 @@
}
elsif ($entity_type eq 'label')
{
- $obj = Label->new($maindb->{DBH});
+ $obj = MusicBrainz::Server::Label->new($maindb->{DBH});
}
$obj->SetMBId($entity_id);
unless ($obj->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -169,7 +169,7 @@
if ($inc & INC_ARTIST || $inc & INC_RELEASES)
{
- $ar = Artist->new($mb->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($tr->GetArtist);
$ar = undef unless $ar->LoadFromId(1);
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/User.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/User.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/User.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -99,7 +99,7 @@
require MusicBrainz;
my $mb = MusicBrainz->new;
$mb->Login(db => 'READWRITE');
- require Artist;
+ require MusicBrainz::Server::Artist;
require UserStuff;
my $us = UserStuff->new($mb->{DBH});
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm (from rev 9731, mb_server/branches/terminology/cgi-bin/Label.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -32,7 +32,7 @@
require MusicBrainz::Server::LinkEntity;
require MusicBrainz::Server::Attribute;
require MusicBrainz::Server::URL;
-require Artist;
+require MusicBrainz::Server::Artist;
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -165,8 +165,8 @@
sub newFromId
{
my ($class, $dbh, $id) = @_;
- require Artist;
- my $object = Artist->new($dbh);
+ require MusicBrainz::Server::Artist;
+ my $object = MusicBrainz::Server::Artist->new($dbh);
$object->SetId($id);
$object->LoadFromId or return undef;
$object;
@@ -175,8 +175,8 @@
sub newFromMBId
{
my ($class, $dbh, $id) = @_;
- require Artist;
- my $object = Artist->new($dbh);
+ require MusicBrainz::Server::Artist;
+ my $object = MusicBrainz::Server::Artist->new($dbh);
$object->SetMBId($id);
$object->LoadFromId or return undef;
$object;
@@ -260,16 +260,16 @@
sub newFromId
{
my ($class, $dbh, $id) = @_;
- require Label;
- my $object = Label->new($dbh);
+ require MusicBrainz::Server::Label;
+ my $object = MusicBrainz::Server::Label->new($dbh);
$object->newFromId($id);
}
sub newFromMBId
{
my ($class, $dbh, $id) = @_;
- require Label;
- my $object = Label->new($dbh);
+ require MusicBrainz::Server::Label;
+ my $object = MusicBrainz::Server::Label->new($dbh);
$object->newFromMBId($id);
}
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -343,8 +343,8 @@
{
if ($artist != &ModDefs::VARTIST_ID)
{
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($artist);
$ar->Remove;
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -52,7 +52,7 @@
# We allow a type of 0. It is mapped to NULL in the DB.
die $self->SetError('Artist type invalid')
- unless Artist::IsValidType($type) or not defined $type;
+ unless MusicBrainz::Server::Artist::IsValidType($type) or not defined $type;
MusicBrainz::Server::Validation::TrimInPlace($resolution) if defined $resolution;
@@ -99,7 +99,7 @@
{
my $subs = UserSubscription->new($self->{DBH});
$subs->SetUser($self->GetModerator);
- my $artist = Artist->new($self->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($self->{DBH});
$artist->SetId($info{'artist_insertid'});
$subs->SubscribeArtists(($artist))
if ($artist->LoadFromId);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -71,7 +71,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{rowid});
if ($ar->LoadFromId())
{
@@ -85,8 +85,8 @@
my $self = shift;
# Check that the referenced artist is still around
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->GetRowId);
unless ($ar->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -57,7 +57,7 @@
# We allow a type of 0. It is mapped to NULL in the DB.
die $self->SetError('Label type invalid')
- unless Label::IsValidType($type) or not defined $type;
+ unless MusicBrainz::Server::Label::IsValidType($type) or not defined $type;
# undefined $begindate means: no date given
my $begindate_str;
@@ -77,7 +77,7 @@
die 'Invalid label code'
if ($labelcode && not MusicBrainz::Server::Validation::IsValidLabelCode($labelcode));
- my $label = Label->new($self->{DBH});
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetName($name);
$label->SetSortName($sortname);
$label->SetType($type);
@@ -95,7 +95,7 @@
{
my $subs = UserSubscription->new($self->{DBH});
$subs->SetUser($self->GetModerator);
- my $label = Label->new($self->{DBH});
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($labelid);
$subs->SubscribeLabels(($label))
if ($label->LoadFromId);
@@ -152,8 +152,8 @@
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
my $id = $self->GetRowId;
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
my ($title, $name);
if ($label->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -53,8 +53,8 @@
my $self = shift;
# Check that the referenced label is still around
- require Label;
- my $ar = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $ar = MusicBrainz::Server::Label->new($self->{DBH});
$ar->SetId($self->GetRowId);
unless ($ar->LoadFromId)
{
@@ -103,8 +103,8 @@
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
my $id = $self->GetRowId;
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
my ($title, $name);
if ($label->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -103,8 +103,8 @@
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
my $id = $self->GetRowId;
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
my ($title, $name);
if ($label->LoadFromId)
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -172,7 +172,7 @@
}
elsif ($new->{entity0type} eq 'artist' || $new->{entity1type} eq 'artist')
{
- my $rel = Artist->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Artist->new($self->{DBH});
$rel->SetId($new->{entity0type} eq 'artist' ? $new->{entity0id} : $new->{entity1id});
if ($rel->LoadFromId())
{
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -229,8 +229,8 @@
if (my $artistid = $new->{"NewArtistId"})
{
- require Artist;
- my $artist = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $artist = MusicBrainz::Server::Artist->new($self->{DBH});
$artist->SetId($artistid);
$artist->Remove;
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -60,8 +60,8 @@
my $self = shift;
# Load the album by ID
- require Artist;
- my $artist = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $artist = MusicBrainz::Server::Artist->new($self->{DBH});
$artist->SetId($self->GetRowId);
unless ($artist->LoadFromId)
{
@@ -93,8 +93,8 @@
{
my ($self, $adjust) = @_;
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->GetRowId);
$ar->LoadFromId;
$ar->UpdateQualityModPending($adjust);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -68,7 +68,7 @@
my $level = &ModDefs::QUALITY_UNKNOWN_MAPPED;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
# Check the old artist
$ar->SetId($self->{artist});
@@ -136,8 +136,8 @@
# try to guess artist id.
if (!$this->{'new.exists'})
{
- require Artist;
- $newartist = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $newartist = MusicBrainz::Server::Artist->new($this->{DBH});
$newartist->SetId($track->GetArtist);
if ($newartist->LoadFromId and
$newartist->GetName eq $this->{'new.name'})
@@ -151,10 +151,10 @@
}
# load artists, to see if we got resolutions to display.
- require Artist;
+ require MusicBrainz::Server::Artist;
# the old one ...
- my $oldartist = Artist->new($this->{DBH});
+ my $oldartist = MusicBrainz::Server::Artist->new($this->{DBH});
$oldartist->SetId($this->GetArtist);
if ($this->{"old.exists"} = $oldartist->LoadFromId)
{
@@ -167,7 +167,7 @@
{
if (!defined $newartist)
{
- $newartist = Artist->new($this->{DBH});
+ $newartist = MusicBrainz::Server::Artist->new($this->{DBH});
$newartist->SetId($this->{'new.id'});
$this->{'new.exists'} = $newartist->LoadFromId;
}
@@ -206,8 +206,8 @@
my ($sortname, $name, $newid) = @$self{qw( new.sortname new.name new.id )};
if (defined $newid && $newid > 0)
{
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($newid);
unless ($ar->LoadFromId)
{
@@ -235,8 +235,8 @@
}
else
{
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetName($name);
$ar->SetSortName($sortname);
$artistid = $ar->Insert(no_alias => 1);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -72,7 +72,7 @@
if ( defined $type )
{
die $self->SetError('Artist type invalid')
- unless Artist::IsValidType($type);
+ unless MusicBrainz::Server::Artist::IsValidType($type);
$new{'Type'} = $type if $type != $ar->GetType();
}
@@ -146,7 +146,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{rowid});
if ($ar->LoadFromId())
{
@@ -201,8 +201,8 @@
}
# Load the artist by ID
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($artist_id);
unless ($ar->LoadFromId)
{
@@ -246,8 +246,8 @@
if (my $artist = $new->{'ArtistId'})
{
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($artist);
$ar->Remove;
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -70,7 +70,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{artist});
if ($ar->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -58,7 +58,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{rowid});
if ($ar->LoadFromId())
{
@@ -87,8 +87,8 @@
}
# Load the artist by ID
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($rowid);
unless ($ar->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -56,7 +56,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{rowid});
if ($ar->LoadFromId())
{
@@ -84,8 +84,8 @@
return STATUS_ERROR;
}
- require Artist;
- my $artist = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($rowid);
unless ($artist->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -87,7 +87,7 @@
if ( defined $type )
{
die $self->SetError('Label type invalid')
- unless Label::IsValidType($type);
+ unless MusicBrainz::Server::Label::IsValidType($type);
$new{'Type'} = $type if $type != $ar->GetType();
}
@@ -208,8 +208,8 @@
}
# Load the label by ID
- require Label;
- my $ar = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $ar = MusicBrainz::Server::Label->new($self->{DBH});
$ar->SetId($label_id);
unless ($ar->LoadFromId)
{
@@ -253,8 +253,8 @@
if (my $label = $new->{'LabelId'})
{
- require Label;
- my $ar = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $ar = MusicBrainz::Server::Label->new($self->{DBH});
$ar->SetId($label);
$ar->Remove;
}
@@ -265,8 +265,8 @@
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
my $id = $self->GetRowId;
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
my ($title, $name);
if ($label->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -136,7 +136,7 @@
}
elsif ($new->{newentity0type} eq 'artist' || $new->{newentity1type} eq 'artist')
{
- my $rel = Artist->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Artist->new($self->{DBH});
$rel->SetId($new->{newentity0type} eq 'artist' ? $new->{newentity0id} : $new->{newentity1id});
if ($rel->LoadFromId())
{
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -274,8 +274,8 @@
require MusicBrainz::Server::Country;
my $country = MusicBrainz::Server::Country->new($self->{DBH});
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
my @notes;
my $ok = 0;
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -90,7 +90,7 @@
}
# if that fails, go by the artist
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($tr->GetArtist());
if ($ar->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -88,7 +88,7 @@
}
# if that fails, go by the artist
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{artist});
if ($ar->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -87,7 +87,7 @@
}
# if that fails, go by the artist
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($tr->GetArtist());
if ($ar->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -122,7 +122,7 @@
);
if (@links)
{
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($links[0]->{link0_id});
return $ar->GetQuality
if ($ar->LoadFromId(0));
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -92,7 +92,7 @@
}
# Check the artist its going to
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{'new.artistid'});
if ($ar->LoadFromId())
{
@@ -128,8 +128,8 @@
# (when this causes false assumptions, remove the followig lines)
if (!$this->{'new.exists'})
{
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($al->GetArtist);
if ($ar->LoadFromId
&& $ar->GetName eq $this->{'new.name'})
@@ -204,8 +204,8 @@
if (not defined $newid)
{
# No such artist, so create one
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetName($name);
$ar->SetSortName($this->{'new.sortname'});
$newid = $ar->Insert(no_alias => 1);
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -128,7 +128,7 @@
if ($artistid > 0)
{
# Check the artist its going to
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($artistid);
if ($ar->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -92,7 +92,7 @@
my $self = shift;
my $quality = -2;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{"new.id"});
if ($ar->LoadFromId())
{
@@ -114,8 +114,8 @@
sub AdjustModPending
{
my ($self, $adjust) = @_;
- require Artist;
- my $ar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
for my $artistid ($self->GetRowId, $self->{"new.id"})
{
@@ -135,8 +135,8 @@
my $name = $self->{'new.name'};
#my $sortname = $self->{'new.sortname'};
- require Artist;
- my $newar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $newar = MusicBrainz::Server::Artist->new($self->{DBH});
if (my $newid = $self->{"new.id"})
{
@@ -158,8 +158,8 @@
}
# Load old artist by ID
- require Artist;
- my $oldar = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $oldar = MusicBrainz::Server::Artist->new($self->{DBH});
$oldar->SetId($rowid);
unless ($oldar->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -89,8 +89,8 @@
sub AdjustModPending
{
my ($self, $adjust) = @_;
- require Label;
- my $ar = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $ar = MusicBrainz::Server::Label->new($self->{DBH});
for my $labelid ($self->GetRowId, $self->{"new.id"})
{
@@ -110,8 +110,8 @@
my $name = $self->{'new.name'};
#my $sortname = $self->{'new.sortname'};
- require Label;
- my $newar = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $newar = MusicBrainz::Server::Label->new($self->{DBH});
if (my $newid = $self->{"new.id"})
{
@@ -133,8 +133,8 @@
}
# Load old label by ID
- require Label;
- my $oldar = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $oldar = MusicBrainz::Server::Label->new($self->{DBH});
$oldar->SetId($rowid);
unless ($oldar->LoadFromId)
{
@@ -195,8 +195,8 @@
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
my $id = $self->GetRowId;
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
my ($title, $name);
if ($label->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -91,14 +91,14 @@
$level = $rel->GetQuality() > $level ? $rel->GetQuality() : $level;
}
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($rel->GetArtist);
if ($ar->LoadFromId())
{
$level = $ar->GetQuality() > $level ? $ar->GetQuality() : $level;
}
- $ar = Artist->new($self->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{'new.artistid'});
if ($ar->LoadFromId())
{
@@ -132,8 +132,8 @@
# the artist sortname (or name?) in 'prevvalue'
if (!$this->{'new.exists'})
{
- require Artist;
- $newartist = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $newartist = MusicBrainz::Server::Artist->new($this->{DBH});
$newartist->SetId($release->GetArtist);
# FIXME is the name = new.sortname comparison necessary?
@@ -154,7 +154,7 @@
my $pat = $this->GetPrev;
if ($this->{'new.name'} =~ /^\Q$pat\E$/i)
{
- my $oar = Artist->new($this->{DBH});
+ my $oar = MusicBrainz::Server::Artist->new($this->{DBH});
# the old one ...
$oar->SetId($this->GetArtist);
$oar->LoadFromId
@@ -163,11 +163,11 @@
# ... and the new resolution if artist is in the DB
# TODO what if new artist with res is created with this mod?
# (see also MOD_CHANGE_TRACK_ARTIST)
- require Artist;
+ require MusicBrainz::Server::Artist;
if ($this->{'new.exists'})
{
if (!defined $newartist) {
- $newartist = Artist->new($this->{DBH});
+ $newartist = MusicBrainz::Server::Artist->new($this->{DBH});
$newartist->SetId($this->{'new.artistid'});
$newartist->LoadFromId;
}
@@ -183,8 +183,8 @@
if (my $id = $self->{'new.artistid'})
{
- require Artist;
- my $artist = Artist->new($self->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $artist = MusicBrainz::Server::Artist->new($self->{DBH});
$artist->SetId($id);
unless ($artist->LoadFromId)
{
@@ -235,8 +235,8 @@
if (not defined($newid) or $newid == -1) # huh?
{
# No such artist, so create one
- require Artist;
- my $artist = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetName($name);
$artist->SetSortName($this->{'new.sortname'});
$newid = $artist->Insert(no_alias => 1);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -52,7 +52,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->{artist});
if ($ar->LoadFromId())
{
@@ -75,8 +75,8 @@
# Now remove the Artist. The Artist will only be removed
# if there are not more references to it.
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($rowid);
require UserSubscription;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -51,7 +51,7 @@
{
my $self = shift;
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($self->GetArtist);
if ($ar->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -60,8 +60,8 @@
# Now remove the Label. The Label will only be removed
# if there are not more references to it.
- require Label;
- my $ar = Label->new($this->{DBH});
+ require MusicBrainz::Server::Label;
+ my $ar = MusicBrainz::Server::Label->new($this->{DBH});
$ar->SetId($rowid);
require UserSubscription;
@@ -88,8 +88,8 @@
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
my $id = $self->GetRowId;
- require Label;
- my $label = Label->new($self->{DBH});
+ require MusicBrainz::Server::Label;
+ my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
my ($title, $name);
if ($label->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -110,7 +110,7 @@
}
elsif ($new->{entity0type} eq 'artist' || $new->{entity1type} eq 'artist')
{
- my $rel = Artist->new($self->{DBH});
+ my $rel = MusicBrainz::Server::Artist->new($self->{DBH});
$rel->SetId($new->{entity0type} eq 'artist' ? $new->{entity0id} : $new->{entity1id});
if ($rel->LoadFromId())
{
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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -95,7 +95,7 @@
}
# if that fails, go by the artist
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($tr->GetArtist());
if ($ar->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -95,7 +95,7 @@
}
# if that fails, go by the artist
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($tr->GetArtist());
if ($ar->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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -77,7 +77,7 @@
$level = $rel->GetQuality() > $level ? $rel->GetQuality() : $level;
}
- my $ar = Artist->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
$ar->SetId($rel->GetArtist);
if ($ar->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -128,7 +128,7 @@
sub Label
{
my $self = shift;
- my $c = Label->new($self->{DBH});
+ my $c = MusicBrainz::Server::Label->new($self->{DBH});
$c->SetId($self->GetLabel);
$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 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -382,8 +382,8 @@
if (!&DBDefs::DB_READ_ONLY)
{
- require Artist;
- $ar = Artist->new($dbh);
+ require MusicBrainz::Server::Artist;
+ $ar = MusicBrainz::Server::Artist->new($dbh);
require TRM;
$gu = TRM->new($dbh);
require Track;
@@ -859,8 +859,8 @@
for my $artistid (map { $_->[3], $_->[8] } @$rows)
{
next if $artists{$artistid};
- require Artist;
- my $ar = Artist->newFromId($sql->{DBH}, $artistid);
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->newFromId($sql->{DBH}, $artistid);
$artists{$artistid} = $ar;
}
@@ -1211,7 +1211,7 @@
return $rdf->ErrorRDF("No artist GUID given");
}
- my $ar = Artist->new($dbh);
+ my $ar = MusicBrainz::Server::Artist->new($dbh);
$ar->SetMBId($id);
if (!$ar->LoadFromId())
{
Modified: mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -357,8 +357,8 @@
return (0, []) if (!$name);
- require Artist;
- $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
my $artists = $ar->GetArtistsFromName($name);
if (scalar(@$artists) == 1)
@@ -455,8 +455,8 @@
}
else
{
- require Artist;
- $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetMBId($artistId);
if (!defined $ar->LoadFromId())
{
@@ -601,8 +601,8 @@
}
else
{
- require Artist;
- $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetMBId($artistId);
if (!defined $ar->LoadFromId())
{
@@ -739,8 +739,8 @@
}
else
{
- require Artist;
- $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetMBId($artistId);
if (!defined $ar->LoadFromId())
{
@@ -827,8 +827,8 @@
my ($this, $name) = @_;
my ($al, @ids, $ar);
- require Artist;
- $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId(&ModDefs::VARTIST_ID);
$ar->LoadFromId();
$this->{artist} = $ar;
Modified: mb_server/branches/terminology/cgi-bin/Track.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Track.pm 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/cgi-bin/Track.pm 2008-03-09 12:59:06 UTC (rev 9732)
@@ -261,8 +261,8 @@
return ();
}
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($this->GetArtist());
if (!defined $ar->LoadFromId())
{
Modified: mb_server/branches/terminology/htdocs/bare/cdlookup.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/cdlookup.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/bare/cdlookup.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -387,7 +387,7 @@
$release->LoadFromId or next;
my $artist = $artists{ $release->GetArtist } ||= do {
- my $artist = Artist->new($dbh);
+ my $artist = MusicBrainz::Server::Artist->new($dbh);
$artist->SetId($release->GetArtist);
$artist->LoadFromId ? $artist : undef;
};
Modified: mb_server/branches/terminology/htdocs/bare/xget.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/xget.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/bare/xget.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -51,7 +51,7 @@
my ($artist, $release, $di);
my ($out, @tracks);
- $artist = Artist->new($mb->{DBH});
+ $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
$release = MusicBrainz::Server::Release->new($mb->{DBH});
$di = MusicBrainz::Server::AlbumCDTOC->new($mb->{DBH});
Modified: mb_server/branches/terminology/htdocs/browseartists.html
===================================================================
--- mb_server/branches/terminology/htdocs/browseartists.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/browseartists.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -58,7 +58,7 @@
my $mb = $m->comp("/comp/dblogin");
my $num_artists = 0;
my @info;
- my $ar = Artist->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
($num_artists, @info) = $ar->GetArtistDisplayList($index, $offset);
# render results-box
Modified: mb_server/branches/terminology/htdocs/browselabels.html
===================================================================
--- mb_server/branches/terminology/htdocs/browselabels.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/browselabels.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -58,7 +58,7 @@
my $mb = $m->comp("/comp/dblogin");
my $num_labels = 0;
my @info;
- my $ar = Label->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Label->new($mb->{DBH});
($num_labels, @info) = $ar->GetLabelDisplayList($index, $offset);
# render results-box
Modified: mb_server/branches/terminology/htdocs/cdi/enter.html
===================================================================
--- mb_server/branches/terminology/htdocs/cdi/enter.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/cdi/enter.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -255,7 +255,7 @@
{
if ($artistid > 0 && !$ARGS{"artistname"})
{
- my $ar = Artist->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($artistid);
$ar->LoadFromId();
$ARGS{"artistname"} = $ar->GetName();
Modified: mb_server/branches/terminology/htdocs/comp/artisttitle
===================================================================
--- mb_server/branches/terminology/htdocs/comp/artisttitle 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/artisttitle 2008-03-09 12:59:06 UTC (rev 9732)
@@ -47,7 +47,7 @@
my $name = $artist->GetName;
my $sortname = $artist->GetSortName;
my $type = $artist->GetType;
- my $type_name = Artist::GetTypeName($type) || '';
+ my $type_name = MusicBrainz::Server::Artist::GetTypeName($type) || '';
my $begin = $artist->GetBeginDate;
my $end = $artist->GetEndDate;
my $resolution = $artist->GetResolution;
@@ -64,14 +64,14 @@
elsif ( $begin )
{
$date_str = "Begin: $begin";
- $date_str = "Born: $begin" if $type == &Artist::ARTIST_TYPE_PERSON;
- $date_str = "Founded: $begin" if $type == &Artist::ARTIST_TYPE_GROUP;
+ $date_str = "Born: $begin" if $type == &MusicBrainz::Server::Artist::ARTIST_TYPE_PERSON;
+ $date_str = "Founded: $begin" if $type == &MusicBrainz::Server::Artist::ARTIST_TYPE_GROUP;
}
elsif ( $end )
{
$date_str = "End: $end";
- $date_str = "Deceased: $end" if $type == &Artist::ARTIST_TYPE_PERSON;
- $date_str = "Dissolved: $end" if $type == &Artist::ARTIST_TYPE_GROUP;
+ $date_str = "Deceased: $end" if $type == &MusicBrainz::Server::Artist::ARTIST_TYPE_PERSON;
+ $date_str = "Dissolved: $end" if $type == &MusicBrainz::Server::Artist::ARTIST_TYPE_GROUP;
}
Modified: mb_server/branches/terminology/htdocs/comp/labeltitle
===================================================================
--- mb_server/branches/terminology/htdocs/comp/labeltitle 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/labeltitle 2008-03-09 12:59:06 UTC (rev 9732)
@@ -48,7 +48,7 @@
my $sortname = $label->GetSortName;
my $country = $label->GetCountry;
my $type = $label->GetType;
- my $type_name = Label::GetTypeName($type) || '';
+ my $type_name = MusicBrainz::Server::Label::GetTypeName($type) || '';
my $labelcode = $label->GetLabelCode;
my $begin = $label->GetBeginDate;
my $end = $label->GetEndDate;
Modified: mb_server/branches/terminology/htdocs/comp/loadartist
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadartist 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/loadartist 2008-03-09 12:59:06 UTC (rev 9732)
@@ -57,7 +57,7 @@
$artistid = $id if (MusicBrainz::Server::Validation::IsNonNegInteger($id) && $id);
# if the $id parameter is a GUID
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
if ($mbid ne "")
{
$artist->SetMBId($mbid);
Modified: mb_server/branches/terminology/htdocs/comp/loadlabel
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadlabel 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/loadlabel 2008-03-09 12:59:06 UTC (rev 9732)
@@ -57,7 +57,7 @@
$labelid = $id if (MusicBrainz::Server::Validation::IsNonNegInteger($id) && $id);
# if the $id parameter is a GUID
- my $label = Label->new($mb->{DBH});
+ my $label = MusicBrainz::Server::Label->new($mb->{DBH});
if ($mbid ne "")
{
$label->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:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM 2008-03-09 12:59:06 UTC (rev 9732)
@@ -47,7 +47,7 @@
if (!$inline and $exists and UserPreference::get('mod_add_album_inline'))
{
- my $ar = Artist->new($this->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($release->GetArtist);
if ($ar->LoadFromId)
{
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ARTIST
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ARTIST 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ARTIST 2008-03-09 12:59:06 UTC (rev 9732)
@@ -43,7 +43,7 @@
my $begin = $new->{'BeginDate'};
my $end = $new->{'EndDate'};
my $type = $new->{'Type'};
- my $type_str = Artist::GetTypeName($type);
+ my $type_str = MusicBrainz::Server::Artist::GetTypeName($type);
my $s = $this->GetStatus;
</%perl>
@@ -92,7 +92,7 @@
% {
<tr>
- <td class="lbl"><% Artist::GetBeginDateName($type) %>:</td>
+ <td class="lbl"><% MusicBrainz::Server::Artist::GetBeginDateName($type) %>:</td>
<td>
<% MusicBrainz::Server::Validation::MakeDisplayDateStr($begin) %></td>
</tr>
@@ -103,7 +103,7 @@
% {
<tr>
- <td class="lbl"><% Artist::GetEndDateName($type) %>:</td>
+ <td class="lbl"><% MusicBrainz::Server::Artist::GetEndDateName($type) %>:</td>
<td>
<% MusicBrainz::Server::Validation::MakeDisplayDateStr($end) %></td>
</tr>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_LABEL
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_LABEL 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_LABEL 2008-03-09 12:59:06 UTC (rev 9732)
@@ -45,7 +45,7 @@
my $begin = $new->{'BeginDate'};
my $end = $new->{'EndDate'};
my $type = $new->{'Type'};
- my $type_str = Label::GetTypeName($type);
+ my $type_str = MusicBrainz::Server::Label::GetTypeName($type);
my $s = $this->GetStatus;
</%perl>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS 2008-03-09 12:59:06 UTC (rev 9732)
@@ -61,7 +61,7 @@
<& /comp/releasedate, $t->{"d"} &> - <& .ShowCountryName, $t->{"c"} &>
% if ($t->{"l"})
% {
-% my $label = Label->new($self->{DBH});
+% my $label = MusicBrainz::Server::Label->new($self->{DBH});
% $label->SetId($t->{"l"});
% $label->LoadFromId();
- Label: <& /comp/linklabel, label => $label &>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ARTIST
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ARTIST 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ARTIST 2008-03-09 12:59:06 UTC (rev 9732)
@@ -79,7 +79,7 @@
% if ($prev->{"Type"} ne $new->{"Type"})
% {
-% my $type_str = Artist::GetTypeName($prev->{"Type"});
+% my $type_str = MusicBrainz::Server::Artist::GetTypeName($prev->{"Type"});
<tr>
<td class="lbl">Type:</td>
@@ -94,7 +94,7 @@
% {
% my $begin = MusicBrainz::Server::Validation::MakeDisplayDateStr($prev->{'BeginDate'});
% $begin = "[Not set]" if ($begin eq "");
-% my $datestr = Artist::GetBeginDateName($prev->{"Type"});
+% my $datestr = MusicBrainz::Server::Artist::GetBeginDateName($prev->{"Type"});
% $datestr =~ s/ / /g;
<tr>
@@ -111,7 +111,7 @@
% {
% my $end = MusicBrainz::Server::Validation::MakeDisplayDateStr($prev->{'EndDate'});
% $end = "[Not set]" if ($end eq "");
-% my $datestr = Artist::GetEndDateName($prev->{"Type"});
+% my $datestr = MusicBrainz::Server::Artist::GetEndDateName($prev->{"Type"});
% $datestr =~ s/ / /g;
<tr>
@@ -197,8 +197,8 @@
% if ($prev->{"Type"} ne $new->{"Type"})
% {
-% my $prevtype = Artist::GetTypeName($prev->{"Type"});
-% my $newtype = Artist::GetTypeName($new->{"Type"}) || "?";
+% my $prevtype = MusicBrainz::Server::Artist::GetTypeName($prev->{"Type"});
+% my $newtype = MusicBrainz::Server::Artist::GetTypeName($new->{"Type"}) || "?";
<tr class="top">
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_LABEL
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_LABEL 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_LABEL 2008-03-09 12:59:06 UTC (rev 9732)
@@ -67,7 +67,7 @@
% if ($prev->{"Type"} ne $new->{"Type"})
% {
-% my $type_str = Label::GetTypeName($prev->{"Type"});
+% my $type_str = MusicBrainz::Server::Label::GetTypeName($prev->{"Type"});
<tr>
<td class="lbl">Type:</td>
@@ -94,7 +94,7 @@
% {
% my $begin = MusicBrainz::Server::Validation::MakeDisplayDateStr($prev->{'BeginDate'});
% $begin = "[Not set]" if ($begin eq "");
-% my $datestr = Label::GetBeginDateName($prev->{"Type"});
+% my $datestr = MusicBrainz::Server::Label::GetBeginDateName($prev->{"Type"});
% $datestr =~ s/ / /g;
<tr>
@@ -111,7 +111,7 @@
% {
% my $end = MusicBrainz::Server::Validation::MakeDisplayDateStr($prev->{'EndDate'});
% $end = "[Not set]" if ($end eq "");
-% my $datestr = Label::GetEndDateName($prev->{"Type"});
+% my $datestr = MusicBrainz::Server::Label::GetEndDateName($prev->{"Type"});
% $datestr =~ s/ / /g;
<tr>
@@ -213,8 +213,8 @@
% if ($prev->{"Type"} ne $new->{"Type"})
% {
-% my $prevtype = Label::GetTypeName($prev->{"Type"});
-% my $newtype = Label::GetTypeName($new->{"Type"}) || "?";
+% my $prevtype = MusicBrainz::Server::Label::GetTypeName($prev->{"Type"});
+% my $newtype = MusicBrainz::Server::Label::GetTypeName($new->{"Type"}) || "?";
<tr class="top">
<td class="lbl" rowspan="2">Type:</td>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS 2008-03-09 12:59:06 UTC (rev 9732)
@@ -62,7 +62,7 @@
<& /comp/releasedate, $t->{"d"} &> - <& .ShowCountryName, $t->{"c"} &>
% if ($t->{"l"})
% {
-% my $label = Label->new($self->{DBH});
+% my $label = MusicBrainz::Server::Label->new($self->{DBH});
% $label->SetId($t->{"l"});
% $label->LoadFromId();
- Label: <& /comp/linklabel, label => $label &>
@@ -87,7 +87,7 @@
<& /comp/releasedate, $t->{"nd"} &> - <& .ShowCountryName, $t->{"nc"} &>
% if ($t->{"nl"})
% {
-% my $label = Label->new($self->{DBH});
+% my $label = MusicBrainz::Server::Label->new($self->{DBH});
% $label->SetId($t->{"nl"});
% $label->LoadFromId();
- Label: <& /comp/linklabel, label => $label &>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MAC_TO_SAC
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_MAC_TO_SAC 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MAC_TO_SAC 2008-03-09 12:59:06 UTC (rev 9732)
@@ -41,7 +41,7 @@
% # link to new artist if all info is known
% if ($this->{'new.exists'})
% {
-% my $artist = Artist->new($this->{DBH});
+% my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
% $artist->SetId($this->{'new.artistid'} );
% my $exists = $artist->LoadFromId;
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:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM 2008-03-09 12:59:06 UTC (rev 9732)
@@ -50,7 +50,7 @@
for my $releasehash (@$releases)
{
my ($releaseexists, $artistexists) = (0, 0);
- my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), Artist->new($this->{DBH}));
+ my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), MusicBrainz::Server::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) = (MusicBrainz::Server::Release->new($this->{DBH}), Artist->new($this->{DBH}));
+ my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), MusicBrainz::Server::Artist->new($this->{DBH}));
$release->SetId($into->{'id'});
if ($releaseexists = $release->LoadFromId())
{
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ARTIST
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ARTIST 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ARTIST 2008-03-09 12:59:06 UTC (rev 9732)
@@ -41,7 +41,7 @@
<%perl>
- my $artist = Artist->new($this->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($this->GetRowId);
if ($artist->LoadFromId)
{
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_LABEL
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_LABEL 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_LABEL 2008-03-09 12:59:06 UTC (rev 9732)
@@ -58,7 +58,7 @@
if ($this->{"new.id"})
{
- my $label = Label->new($this->{DBH});
+ my $label = MusicBrainz::Server::Label->new($this->{DBH});
$label->SetId($this->{"new.id"});
if ($label->LoadFromId)
{
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM 2008-03-09 12:59:06 UTC (rev 9732)
@@ -43,7 +43,7 @@
<%perl>
my $artistexists = 0;
- my $artist = Artist->new($this->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($this->GetArtist);
if ($artist->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:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_DISCID 2008-03-09 12:59:06 UTC (rev 9732)
@@ -60,7 +60,7 @@
<%perl>
my ($releaseexists, $artistexists) = (0, 0);
- my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), Artist->new($this->{DBH}));
+ my ($release, $artist) = (MusicBrainz::Server::Release->new($this->{DBH}), MusicBrainz::Server::Artist->new($this->{DBH}));
$release->SetId($this->GetPrev);
if ($releaseexists = $release->LoadFromId())
{
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS 2008-03-09 12:59:06 UTC (rev 9732)
@@ -61,7 +61,7 @@
<& /comp/releasedate, $t->{"d"} &> - <& .ShowCountryName, $t->{"c"} &>
% if ($t->{"l"})
% {
-% my $label = Label->new($self->{DBH});
+% my $label = MusicBrainz::Server::Label->new($self->{DBH});
% $label->SetId($t->{"l"});
% $label->LoadFromId();
- Label: <& /comp/linklabel, label => $label &>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_SAC_TO_MAC
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_SAC_TO_MAC 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_SAC_TO_MAC 2008-03-09 12:59:06 UTC (rev 9732)
@@ -37,7 +37,7 @@
my $this = shift;
my ($exists, $id, $name, $resolution) = (0, $this->GetArtist, $this->GetPrev, $this->{'old.res'});
- my $artist = Artist->new($this->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($id);
$exists = $artist->LoadFromId;
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/check-artists
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/check-artists 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/check-artists 2008-03-09 12:59:06 UTC (rev 9732)
@@ -98,7 +98,7 @@
my @resolved_artists;
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
my @artists;
my $last_artistname;
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/check-labels
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/check-labels 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/check-labels 2008-03-09 12:59:06 UTC (rev 9732)
@@ -38,7 +38,7 @@
my @missing_labels;
- my $label = Label->new($mb->{DBH});
+ my $label = MusicBrainz::Server::Label->new($mb->{DBH});
my @items = sort map { /^rev_label-(\d+)$/ ? ($1) : () } keys %ARGS;
for my $j (@items)
{
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/convert-moverelease
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/convert-moverelease 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/convert-moverelease 2008-03-09 12:59:06 UTC (rev 9732)
@@ -43,7 +43,7 @@
my $artistfilter_search = $ARGS{"artistfilter_search"};
my ($artist, @artists);
- $artist = Artist->new($mb->{DBH});
+ $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
@artists = @{ $artist->GetArtistsFromName($curr_artistname) };
# if a single item was found, set it and redirect back to the form.
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/convert-tosac
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/convert-tosac 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/convert-tosac 2008-03-09 12:59:06 UTC (rev 9732)
@@ -66,7 +66,7 @@
my @dupes;
if ($curr_artistname ne "")
{
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
my $artistlist = $artist->GetArtistsFromName($curr_artistname);
if (@$artistlist == 1 and @$artistlist[0]->GetName eq $curr_artistname)
{
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:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/init-editall 2008-03-09 12:59:06 UTC (rev 9732)
@@ -67,7 +67,7 @@
# LOAD ARTIST
# ---------------------------------------------------------------
# load release artist from database
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
$artist->SetId($release->GetArtist);
if (not $artist->LoadFromId)
{
@@ -203,7 +203,7 @@
# create an artist object, and load the resolution from
# the database
- $artist = Artist->new($mb->{DBH}) if (not defined $artist);
+ $artist = MusicBrainz::Server::Artist->new($mb->{DBH}) if (not defined $artist);
$artist->SetId($artistid);
if (not $artist->LoadFromId)
{
Modified: mb_server/branches/terminology/htdocs/edit/album/add.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/add.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/album/add.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -70,7 +70,7 @@
my $mb = $m->comp("/comp/dblogin");
- my $ar = Artist->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($artistid);
$ar->LoadFromId
or return $m->comp(
Modified: mb_server/branches/terminology/htdocs/edit/albumbatch/done.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumbatch/done.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/albumbatch/done.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -296,7 +296,7 @@
# Sort by artist so that all the artists are sequential
@releaseObjs = sort { $a->GetArtist() <=> $b->GetArtist()} @releaseObjs;
- my $ar = Artist->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId(0);
for my $release (@releaseObjs)
Modified: mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -175,7 +175,7 @@
my (%merged, @id_numtracks);
my ($id, $i, $release, @tracks, $track, @ids);
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
foreach $release (@objs)
{
Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -196,7 +196,7 @@
return $m->comp("/comp/redirect", "/edit/albumreleases/selectlabel.html?releaseid=".$releaseid)
if $ARGS{"continue"} && ((@errors == 0) || !@errors);
- my $artist = Artist->new(undef);
+ my $artist = MusicBrainz::Server::Artist->new(undef);
$artist->SetId($edit->{"artist"}{"id"});
$artist->SetName($edit->{"artist"}{"name"});
$artist->SetSortName($edit->{"artist"}{"sortname"});
Modified: mb_server/branches/terminology/htdocs/edit/artist/add.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/artist/add.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/artist/add.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -67,7 +67,7 @@
or return $m->comp("/comp/layout/badarguments",
text => "Argument resolution has an invalid format.");
- MusicBrainz::Server::Validation::IsNonNegInteger($type) && Artist::IsValidType($type)
+ MusicBrainz::Server::Validation::IsNonNegInteger($type) && MusicBrainz::Server::Artist::IsValidType($type)
or return $m->comp("/comp/layout/badarguments",
text =>"Argument type is invalid.");
@@ -84,7 +84,7 @@
my @dupes;
if ($name ne "")
{
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
my $artists = $artist->GetArtistsFromName($name);
my $norm_name = MusicBrainz::Server::Validation::NormaliseSortText($name);
@@ -114,7 +114,7 @@
}
else
{
- push @messages, "Please Select a valid type." if (not Artist::IsValidType($type));
+ push @messages, "Please Select a valid type." if (not MusicBrainz::Server::Artist::IsValidType($type));
push @messages, "Please enter the Name." if ($name eq "");
push @messages, "The artist name contains 'feat.' in it, see the <a href=\"/doc/FeaturingArtistStyle\">style guidelines</a> for the correct way to credit featuring artists." if ($attempts == 0 && $name =~ /feat\./);
push @messages, "Please enter the Sort Name." if ($sortname eq "");
Modified: mb_server/branches/terminology/htdocs/edit/artist/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/artist/edit.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/artist/edit.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -96,7 +96,7 @@
my @dupes;
if ($name ne "")
{
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
my $artists = $artist->GetArtistsFromName($name);
my $norm_name = MusicBrainz::Server::Validation::NormaliseSortText($name);
@@ -119,7 +119,7 @@
}
else
{
- push @messages, "Please Select a valid type." if (not Artist::IsValidType($type));
+ push @messages, "Please Select a valid type." if (not MusicBrainz::Server::Artist::IsValidType($type));
push @messages, "Please Enter the Name." if ($name eq "");
push @messages, "Please Enter the Sort Name." if ($sortname eq "");
push @messages, "Begin Date has to be either valid or empty"
Modified: mb_server/branches/terminology/htdocs/edit/artist/main-form
===================================================================
--- mb_server/branches/terminology/htdocs/edit/artist/main-form 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/artist/main-form 2008-03-09 12:59:06 UTC (rev 9732)
@@ -46,8 +46,8 @@
</%args>
<%perl>
- my $begindate_str = Artist::GetBeginDateName($type);
- my $enddate_str = Artist::GetEndDateName($type);
+ my $begindate_str = MusicBrainz::Server::Artist::GetBeginDateName($type);
+ my $enddate_str = MusicBrainz::Server::Artist::GetEndDateName($type);
</%perl>
Modified: mb_server/branches/terminology/htdocs/edit/artist/strict.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/artist/strict.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/artist/strict.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -56,7 +56,7 @@
# load artist
my $artist = $m->comp("/comp/loadartist", $mb, $artistid);
my $strict = $artist->GetStrict;
- my $stricttext = Artist::GetStrictName($strict);
+ my $stricttext = MusicBrainz::Server::Artist::GetStrictName($strict);
# we got a form submission to handle
if ($submitvalue ne "")
@@ -115,22 +115,22 @@
<td> </td>
<td class="notetext">
<%perl>
- if ($strict != &Artist::ARTIST_STRICT_LOOSE)
+ if ($strict != &MusicBrainz::Server::Artist::ARTIST_STRICT_LOOSE)
{
- $m->out('<input type="radio" name="level" value="' . &Artist::ARTIST_STRICT_LOOSE . '">Loose -- ') ;
+ $m->out('<input type="radio" name="level" value="' . &MusicBrainz::Server::Artist::ARTIST_STRICT_LOOSE . '">Loose -- ') ;
$m->out('this edit level generally requires fewer votes and a shorter voting period and ') ;
$m->out('should be used for artists that require a lot of cleanup.') ;
$m->out('This level makes it easy to change information for this artist.<br/>') ;
}
- if ($strict != &Artist::ARTIST_STRICT_NORMAL)
+ if ($strict != &MusicBrainz::Server::Artist::ARTIST_STRICT_NORMAL)
{
- $m->out('<input type="radio" name="level" value="'. &Artist::ARTIST_STRICT_NORMAL .'">Normal -- ') ;
+ $m->out('<input type="radio" name="level" value="'. &MusicBrainz::Server::Artist::ARTIST_STRICT_NORMAL .'">Normal -- ') ;
$m->out('this edit level requires a normal amount of votes and a normal voting period ') ;
$m->out('and should be used for most artists.<br/>') ;
}
- if ($strict != &Artist::ARTIST_STRICT_STRICT)
+ if ($strict != &MusicBrainz::Server::Artist::ARTIST_STRICT_STRICT)
{
- $m->out('<input type="radio" name="level" value="'. &Artist::ARTIST_STRICT_STRICT .'">Strict -- ') ;
+ $m->out('<input type="radio" name="level" value="'. &MusicBrainz::Server::Artist::ARTIST_STRICT_STRICT .'">Strict -- ') ;
$m->out('this edit level generally requires more votes and a longer voting period ') ;
$m->out('and should be used with artists whose information is fairly complete. ') ;
$m->out('This level makes it hard to change information for this artist.<br/>') ;
Modified: mb_server/branches/terminology/htdocs/edit/discid/move.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/discid/move.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -319,7 +319,7 @@
% my $newrelease;
% while ($newrelease = shift @releases)
% {
-% my $newar = Artist->new($mb->{DBH});
+% my $newar = MusicBrainz::Server::Artist->new($mb->{DBH});
% $newar->SetId($newrelease->GetArtist);
% $newar->LoadFromId();
Modified: mb_server/branches/terminology/htdocs/edit/label/add.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/label/add.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/label/add.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -72,7 +72,7 @@
or return $m->comp("/comp/layout/badarguments",
text => "Argument resolution has an invalid format.");
- MusicBrainz::Server::Validation::IsNonNegInteger($type) && Label::IsValidType($type)
+ MusicBrainz::Server::Validation::IsNonNegInteger($type) && MusicBrainz::Server::Label::IsValidType($type)
or return $m->comp("/comp/layout/badarguments",
text =>"Argument type is invalid.");
@@ -87,7 +87,7 @@
my @dupes;
if ($name ne "")
{
- my $label = Label->new($mb->{DBH});
+ my $label = MusicBrainz::Server::Label->new($mb->{DBH});
my $labels = $label->GetLabelsFromName($name);
my $norm_name = MusicBrainz::Server::Validation::NormaliseSortText($name);
@@ -124,7 +124,7 @@
{
MusicBrainz::Server::Validation::TrimInPlace($resolution, $name, $sortname);
- push @messages, "Please Select a valid type." if (not Label::IsValidType($type));
+ push @messages, "Please Select a valid type." if (not MusicBrainz::Server::Label::IsValidType($type));
push @messages, "Please enter the Name." if ($name eq "");
push @messages, "Please enter the Sort Name." if ($sortname eq "");
Modified: mb_server/branches/terminology/htdocs/edit/label/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/label/edit.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/label/edit.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -99,7 +99,7 @@
# give the user a stern warning about editing a duplicate label.
my ($samecheck, $samename) = (1, 0);
my @dupes;
- my $dupar = Label->new($mb->{DBH});
+ my $dupar = MusicBrainz::Server::Label->new($mb->{DBH});
my $labels = $dupar->GetLabelsFromName($name);
if (defined $labels && scalar(@$labels))
{
@@ -135,7 +135,7 @@
MusicBrainz::Server::Validation::TrimInPlace($resolution, $name, $sortname);
- push @messages, "Please Select a valid type." if (not Label::IsValidType($type));
+ push @messages, "Please Select a valid type." if (not MusicBrainz::Server::Label::IsValidType($type));
push @messages, "Please Enter the Name." if ($name eq "");
push @messages, "Please Enter the Sort Name." if ($sortname eq "");
push @messages, "Label Code has a to be a number with max. 5 digits"
Modified: mb_server/branches/terminology/htdocs/edit/label/main-form
===================================================================
--- mb_server/branches/terminology/htdocs/edit/label/main-form 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/edit/label/main-form 2008-03-09 12:59:06 UTC (rev 9732)
@@ -71,7 +71,7 @@
<label for="editartist_type">Type:</label></td>
<td>
<select name="type" id="editartist_type">
- <& /comp/options, Label::GetLabelTypes(), $type &>
+ <& /comp/options, MusicBrainz::Server::Label::GetLabelTypes(), $type &>
</select></td>
</tr>
Modified: mb_server/branches/terminology/htdocs/freedb/review.html
===================================================================
--- mb_server/branches/terminology/htdocs/freedb/review.html 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/freedb/review.html 2008-03-09 12:59:06 UTC (rev 9732)
@@ -70,7 +70,7 @@
push @t, $track;
}
- my $artist = Artist->new($mb->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
$artist->SetId(0);
$artist->SetName($artistname);
@@ -191,7 +191,7 @@
push @t, $track;
}
- $artist = Artist->new($mb->{DBH});
+ $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
$artist->SetId(1);
$artist->SetName("Various Artists");
Modified: mb_server/branches/terminology/htdocs/mod/search/setquery.inc
===================================================================
--- mb_server/branches/terminology/htdocs/mod/search/setquery.inc 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/mod/search/setquery.inc 2008-03-09 12:59:06 UTC (rev 9732)
@@ -395,7 +395,7 @@
if (MusicBrainz::Server::Validation::IsNonNegInteger($artist_id) and $artist_id)
{
# Validate id and get name
- my $ar = Artist->new($dbh);
+ my $ar = MusicBrainz::Server::Artist->new($dbh);
$ar->SetId($artist_id);
if ($ar->LoadFromId)
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:47:12 UTC (rev 9731)
+++ mb_server/branches/terminology/htdocs/reports/show_album_duplicates.inc 2008-03-09 12:59:06 UTC (rev 9732)
@@ -40,7 +40,7 @@
<%perl>
use MusicBrainz::Server::Release;
- use Artist;
+ use MusicBrainz::Server::Artist;
use MusicBrainz::Server::PagedReport;
use File::Basename qw(dirname);
use ModDefs;
@@ -118,7 +118,7 @@
$al->SetMBId($entry->{album_mbid});
if ($al->LoadFromId(1))
{
- my $ar = Artist->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($al->GetArtist);
$ar->LoadFromId;
push @section, {
Modified: mb_server/branches/terminology/htdocs/reports/show_artist_duplicates.inc
===================================================================
--- mb_server/branches/terminology/htdocs/reports/show_artist_duplicates.inc 2008-03-09 10:47:12 UTC (rev 9731)
+++ mb_server/branches/