[mb-commits] r10291 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server MusicBrainz/Server/Facade MusicBrainz/Server/Handlers/WS/1 MusicBrainz/Server/Model MusicBrainz/Server/Moderation
root at musicbrainz.org
root at musicbrainz.org
Mon Sep 1 23:52:32 UTC 2008
Author: acid2
Date: 2008-09-01 23:52:32 +0000 (Mon, 01 Sep 2008)
New Revision: 10291
Modified:
mb_server/branches/TemplateToolkit/lib/FreeDB.pm
mb_server/branches/TemplateToolkit/lib/Insert.pm
mb_server/branches/TemplateToolkit/lib/MM.pm
mb_server/branches/TemplateToolkit/lib/MM_2_0.pm
mb_server/branches/TemplateToolkit/lib/MM_2_1.pm
mb_server/branches/TemplateToolkit/lib/Moderation.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Annotation.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Release.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Track.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ModBot.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Release.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST_ANNOTATION.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_ATTR.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_TYPE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_ANNOTATION.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_WIKIDOC.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_ATTR.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_TYPE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_ATTR.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_TYPE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm
mb_server/branches/TemplateToolkit/lib/QuerySupport.pm
mb_server/branches/TemplateToolkit/lib/TaggerSupport.pm
Log:
All Get/SetArtist accesors -> artist accessors
Modified: mb_server/branches/TemplateToolkit/lib/FreeDB.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/FreeDB.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/FreeDB.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -384,8 +384,8 @@
}
}
- my $artists = $ar->GetArtistsFromName($info->{artist});
- $artists = $ar->GetArtistsFromSortname($info->{artist}) if (!scalar(@$artists));
+ my $artists = $ar->select_artists_by_name($info->{artist});
+ $artists = $ar->select_artists_by_sort_name($info->{artist}) if (!scalar(@$artists));
if (scalar(@$artists))
{
my (@albums, $al);
Modified: mb_server/branches/TemplateToolkit/lib/Insert.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -330,7 +330,7 @@
# If we get to this point, we will have verified the Album by
# loading it from disk. Check to make sure that the specified
# album does indeed go to the correct artist.
- if ($artistid != $al->GetArtist())
+ if ($artistid != $al->artist())
{
#die "Insert failed: Artist/Album id clash.\n";
}
@@ -365,7 +365,7 @@
if ($forcenewalbum)
{
$al->SetName($album);
- $al->SetArtist($artistid);
+ $al->artist($artistid);
if (exists $info->{attrs})
{
$al->attributes(@{ $info->{attrs} });
@@ -383,7 +383,7 @@
{
my @ids;
- $al->SetArtist($artistid);
+ $al->artist($artistid);
(@ids) = $al->GetAlbumListFromName($album);
if (scalar(@ids) == 0)
{
@@ -672,7 +672,7 @@
) if defined $opts{"FreedbId"}
and defined $opts{"FreedbCat"};
- ($mod->GetArtist, $mod->row_id, \@mods);
+ ($mod->artist, $mod->row_id, \@mods);
};
if ($@)
Modified: mb_server/branches/TemplateToolkit/lib/MM.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MM.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -145,7 +145,7 @@
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
- $ar->SetId($tr->GetArtist());
+ $ar->SetId($tr->artist());
# TODO This is complaining about the ID being undef
$ar->LoadFromId();
@@ -199,13 +199,13 @@
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
- $ar->SetId($al->GetArtist);
+ $ar->SetId($al->artist);
$ar->LoadFromId;
$this->AddToCache(0, 'artist', $ar);
require MusicBrainz::Server::Track;
my @tracks = $al->LoadTracks;
- my $is_va = $al->GetArtist == VARTIST_ID || $al->HasMultipleTrackArtists;
+ my $is_va = $al->artist == VARTIST_ID || $al->HasMultipleTrackArtists;
my @ids;
my %artists;
@@ -215,7 +215,7 @@
if ($is_va)
{
my $var = MusicBrainz::Server::Artist->new($this->{DBH});
- $var->SetId($tr->GetArtist);
+ $var->SetId($tr->artist);
if ($var->LoadFromId)
{
$this->AddToCache(0, 'artist', $var);
@@ -527,7 +527,7 @@
return () if not defined $ref;
# Artists and TRMIDs do not have any references, so they are not listed here
- return $this->_GetArtistReferences($ref, $ref->{obj}, $depth)
+ return $this->_artistReferences($ref, $ref->{obj}, $depth)
if ($ref->{type} eq 'artist');
return $this->_GetAlbumReferences($ref, $ref->{obj}, $depth)
if ($ref->{type} eq 'album');
@@ -539,7 +539,7 @@
}
# For an Artist, add a ref for each album
-sub _GetArtistReferences
+sub _artistReferences
{
my ($this, $ref, $artist, $depth) = @_;
my (@albums, @albumids, $album, %info, @ret);
@@ -572,9 +572,9 @@
# TODO get rid of %info
my (@ret, %info);
- my $albumartist = $album->GetArtist();
+ my $albumartist = $album->artist();
$info{type} = 'artist';
- $info{id} = $album->GetArtist();
+ $info{id} = $album->artist();
$info{obj} = undef;
push @ret, {%info};
@@ -589,7 +589,7 @@
if ($is_va)
{
$info{type} = 'artist';
- $info{id} = $track->GetArtist();
+ $info{id} = $track->artist();
$info{obj} = undef;
push @ret, {%info};
}
@@ -616,7 +616,7 @@
# TODO: Should the TRM output also be a seperate depth?
$info{type} = 'artist';
- $info{id} = $track->GetArtist();
+ $info{id} = $track->artist();
$info{tracknum} = $track->GetSequence();
$info{obj} = undef;
push @ret, {%info};
Modified: mb_server/branches/TemplateToolkit/lib/MM_2_0.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM_2_0.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MM_2_0.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -101,7 +101,7 @@
$album = $ref->{obj};
- $artist = $this->GetFromCache('artist', $album->GetArtist());
+ $artist = $this->GetFromCache('artist', $album->artist());
return "" if (!defined $artist);
$out = $this->BeginDesc("mm:Album", $this->GetBaseURI() .
@@ -172,7 +172,7 @@
$gu = MusicBrainz::Server::TRM->new($this->{DBH});
@TRM = $gu->GetTRMFromTrackId($track->GetId());
- $artist = $this->GetFromCache('artist', $track->GetArtist());
+ $artist = $this->GetFromCache('artist', $track->artist());
return "" if (!defined $artist);
$out = $this->BeginDesc("mm:Track", $this->GetBaseURI() .
Modified: mb_server/branches/TemplateToolkit/lib/MM_2_1.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM_2_1.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MM_2_1.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -118,7 +118,7 @@
return "" if (!defined $this->GetBaseURI());
$album = $ref->{obj};
- $artist = $this->GetFromCache('artist', $album->GetArtist());
+ $artist = $this->GetFromCache('artist', $album->artist());
@releases = $album->ReleaseEvents;
require MusicBrainz::Server::Country;
@@ -136,7 +136,7 @@
}
else
{
- my $temp = $album->GetArtist();
+ my $temp = $album->artist();
if ($temp && $temp == &ModDefs::VARTIST_ID)
{
$out .= $this->Element("dc:creator", "", "rdf:resource",
@@ -273,7 +273,7 @@
}
$track = $ref->{obj};
- $artist = $this->GetFromCache('artist', $track->GetArtist());
+ $artist = $this->GetFromCache('artist', $track->artist());
$out = $this->BeginDesc("mm:Track", $this->GetBaseURI() .
"/track/" . $track->GetMBId());
@@ -578,7 +578,7 @@
require MusicBrainz::Server::Artist;
$artist = MusicBrainz::Server::Artist->new($this->{DBH});
- $artist->SetId($tr->GetArtist());
+ $artist->SetId($tr->artist());
$artist->LoadFromId();
$this->AddToCache(0, 'artist', $artist);
$out .= $this->OutputArtistRDF({ obj=>$artist });
Modified: mb_server/branches/TemplateToolkit/lib/Moderation.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Moderation.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/Moderation.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -699,14 +699,12 @@
return $level->{expireaction};
}
-sub GetArtist
+sub artist
{
- return $_[0]->{artist};
-}
+ my ($self, $new_artist) = @_;
-sub SetArtist
-{
- $_[0]->{artist} = $_[1];
+ if (defined $new_artist) { $self->{artist} = $new_artist; }
+ return $self->{artist};
}
sub GetYesVotes
@@ -795,34 +793,28 @@
$_[0]->{vote} = $_[1];
}
-sub GetArtistName
+sub artist_name
{
- return $_[0]->{artistname};
-}
+ my ($self, $new_name) = @_;
-sub SetArtistName
-{
- $_[0]->{artistname} = $_[1];
+ if (defined $new_name) { $self->{artistname} = $new_name; }
+ return $self->{artistname};
}
-sub GetArtistSortName
+sub artist_sort_name
{
- return $_[0]->{artistsortname};
-}
+ my ($self, $new_sort) = @_;
-sub SetArtistSortName
-{
- $_[0]->{artistsortname} = $_[1];
+ if (defined $new_sort) { $self->{artistsortname} = $new_sort; }
+ return $self->{artistsortname};
}
-sub GetArtistResolution
+sub artist_resolution
{
- return $_[0]->{artistresolution};
-}
+ my ($self, $new_resolution) = @_;
-sub SetArtistResolution
-{
- $_[0]->{artistresolution} = $_[1];
+ if (defined $new_resolution) { $self->{artistresolution} = $new_resolution; }
+ return $self->{artistresolution};
}
sub moderator_name
@@ -898,7 +890,7 @@
$edit->table($row[1]);
$edit->SetColumn($row[2]);
$edit->row_id($row[3]);
- $edit->SetArtist($row[4]);
+ $edit->artist($row[4]);
$edit->type($row[5]);
$edit->SetPrev($row[6]);
$edit->SetNew($row[7]);
@@ -906,9 +898,9 @@
$edit->moderator_name($row[9]);
$edit->SetYesVotes($row[10]);
$edit->SetNoVotes($row[11]);
- $edit->SetArtistName($row[12]);
- $edit->SetArtistSortName($row[13]);
- $edit->SetArtistResolution($row[14]);
+ $edit->artist_name($row[12]);
+ $edit->artist_sort_name($row[13]);
+ $edit->artist_resolution($row[14]);
$edit->SetStatus($row[15]);
$edit->SetVote(&ModDefs::VOTE_UNKNOWN);
$edit->SetDepMod($row[17]);
@@ -1099,7 +1091,7 @@
# The PreInsert method must perform any work it needs to - e.g. inserting
# records which maybe ->DeniedAction will delete later - and then override
# these default column values as appropriate:
- $this->SetArtist(&ModDefs::VARTIST_ID);
+ $this->artist(&ModDefs::VARTIST_ID);
$this->table("");
$this->SetColumn("");
$this->row_id(0);
@@ -1151,7 +1143,7 @@
)",
$this->table, $this->GetColumn, $this->row_id,
$this->GetPrev, $this->GetNew,
- $this->moderator, $this->GetArtist, $this->type,
+ $this->moderator, $this->artist, $this->type,
$this->GetDepMod,
&ModDefs::STATUS_OPEN, sprintf("%d days", $level->{duration}),
$this->language_id
@@ -1344,7 +1336,7 @@
}
$edit->SetId($r->{id});
- $edit->SetArtist($r->{artist});
+ $edit->artist($r->{artist});
$edit->moderator($r->{moderator});
$edit->table($r->{tab});
$edit->SetColumn($r->{col});
@@ -1395,7 +1387,7 @@
$edit->moderator_name($editor_cache{$uid});
# Fetch artist into cache if not loaded before.
- my $artistid = $edit->GetArtist;
+ my $artistid = $edit->artist;
if (not defined $artist_cache{$artistid})
{
my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
@@ -1407,9 +1399,9 @@
}
my $artist = $artist_cache{$artistid};
- $edit->SetArtistName($artist ? $artist->GetName : "?");
- $edit->SetArtistSortName($artist ? $artist->sort_name : "?");
- $edit->SetArtistResolution($artist ? $artist->resolution : "?");
+ $edit->artist_name($artist ? $artist->GetName : "?");
+ $edit->artist_sort_name($artist ? $artist->sort_name : "?");
+ $edit->artist_resolution($artist ? $artist->resolution : "?");
# Find vote
if ($edit->GetVote == VOTE_UNKNOWN and $voter)
@@ -1785,17 +1777,17 @@
$mason->out(qq!<tr class="entity"><td class="lbl">Artist:</td>!);
$mason->out(qq!<td>!);
$mason->comp("/comp/linkartist",
- id => $this->GetArtist,
- name => $this->GetArtistName,
- sortname => $this->GetArtistSortName,
- resolution => $this->GetArtistResolution,
+ id => $this->artist,
+ name => $this->artist_name,
+ sortname => $this->artist_sort_name,
+ resolution => $this->artist_resolution,
strong => 0
);
$mason->out(qq!</td>!);
if ($showeditlinks)
{
$mason->out(qq!<td class="editlinks">!);
- $mason->comp("/comp/linkedits", type => "artist", id => $this->GetArtist, explain => 1);
+ $mason->comp("/comp/linkedits", type => "artist", id => $this->artist, explain => 1);
$mason->out(qq!</td>!);
}
$mason->out(qq!</tr>!);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Annotation.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Annotation.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Annotation.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -110,7 +110,7 @@
use Switch;
switch ($entity_type)
{
- case('artist') { $self->SetArtist($new_id); }
+ case('artist') { $self->artist($new_id); }
case('label') { $self->SetLabel($new_id); }
case('release') { $self->SetRelease($new_id); }
case('track') { $self->SetTrack($new_id); }
@@ -125,11 +125,6 @@
return $_[0]->{rowid};
}
-sub GetArtist
-{
- return $_[0]->{rowid};
-}
-
sub GetLabel
{
return $_[0]->{rowid};
@@ -226,10 +221,17 @@
$_[0]->{rowid} = $_[1];
}
-sub SetArtist
+sub artist
{
- $_[0]->{type} = ARTIST_ANNOTATION;
- $_[0]->{rowid} = $_[1];
+ my ($self, $new_artist) = @_;
+
+ if (defined $new_artist)
+ {
+ $self->{type } = ARTIST_ANNOTATION;
+ $self->{rowid} = $new_artist;
+ }
+
+ return $self->{rowid};
}
sub SetLabel
@@ -327,7 +329,7 @@
}
# Get the latest Annotation for the artist or release.
-# To make this work, SetArtist() or SetRelease() have to be called
+# To make this work, artist() or SetRelease() have to be called
sub GetLatestAnnotation
{
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -199,7 +199,7 @@
if (!$this->resolution())
{
- my $ar_list = $this->GetArtistsFromName($name);
+ my $ar_list = $this->select_artists_by_name($name);
foreach my $ar (@$ar_list)
{
return $ar->GetId if ($ar->GetName() eq $name);
@@ -645,14 +645,14 @@
}
# Return a hash of hashes for artists that match the given artist name
-sub GetArtistsFromName
+sub select_artists_by_name
{
my ($this, $artistname) = @_;
MusicBrainz::Server::Validation::TrimInPlace($artistname) if defined $artistname;
if (not defined $artistname or $artistname eq "")
{
- carp "Missing artistname in GetArtistsFromName";
+ carp "Missing artistname in select_artists_by_name";
return [];
}
@@ -699,7 +699,7 @@
last if scalar(@$artists);
# If that failed, then try to find the artist by sortname
- $artists = $this->GetArtistsFromSortname($artistname)
+ $artists = $this->select_artists_by_sort_name($artistname)
and return $artists;
# If that failed too, then try the artist aliases
@@ -741,14 +741,14 @@
}
# Return a hash of hashes for artists that match the given artist's sortname
-sub GetArtistsFromSortname
+sub select_artists_by_sort_name
{
my ($this, $sortname) = @_;
MusicBrainz::Server::Validation::TrimInPlace($sortname) if defined $sortname;
if (not defined $sortname or $sortname eq "")
{
- carp "Missing sortname in GetArtistsFromSortname";
+ carp "Missing sortname in select_artists_by_sort_name";
return [];
}
@@ -901,7 +901,7 @@
# Given an index character ($ind), a page offset ($offset)
# it will return an array of references to an array
# of artistid, sortname, modpending. The array is empty on error.
-sub GetArtistDisplayList
+sub artist_browse_selection
{
my ($this, $ind, $offset) = @_;
my ($query, @info, @row, $sql, $page, $page_max, $ind_max, $un, $max_artists);
@@ -988,7 +988,7 @@
$album->SetId($row[0]);
$album->SetName($row[1]);
$album->SetModPending($row[2]);
- $album->SetArtist($this->{id});
+ $album->artist($this->{id});
$album->SetMBId($row[3]);
$row[4] =~ s/^\{(.*)\}$/$1/;
$album->{attrs} = [ split /,/, $row[4] ];
@@ -1049,7 +1049,7 @@
require MusicBrainz::Server::Release;
$album = MusicBrainz::Server::Release->new($this->{DBH});
$album->SetId($row[0]);
- $album->SetArtist($row[1]);
+ $album->artist($row[1]);
$album->SetName($row[2]);
$album->SetModPending($row[3]);
$album->SetMBId($row[4]);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -58,7 +58,7 @@
my ($type, $status) = $release->GetReleaseTypeAndStatus;
return $class->new({
- artist_id => $release->GetArtist,
+ artist_id => $release->artist,
attributes => [ map { $release->attribute_name($_) } @attributes ],
cover_art_url => $release->coverart_url,
disc_ids => $release->discid_count,
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -27,7 +27,7 @@
my ($class, $track) = @_;
$class->new({
- artist_id => $track->GetArtist,
+ artist_id => $track->artist,
duration => MusicBrainz::Server::Track::FormatTrackLength($track->GetLength),
id => $track->GetId,
number => $track->GetSequence,
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -540,11 +540,11 @@
foreach my $tr (@$tracks)
{
- if ($ar->GetId != $tr->GetArtist)
+ if ($ar->GetId != $tr->artist)
{
my $ar;
$ar = MusicBrainz::Server::Artist->new($tr->{DBH});
- $ar->SetId($tr->GetArtist);
+ $ar->SetId($tr->artist);
$ar->LoadFromId();
xml_track($ar, $tr, $tr_inc);
}
@@ -868,7 +868,7 @@
{
print '>';
my $al = load_object(\%cache, $obj->{DBH}, $rel->{id}, $rel->{type}, 0);
- my $ar = load_object(\%cache, $obj->{DBH}, $al->GetArtist, 'artist', 0);
+ my $ar = load_object(\%cache, $obj->{DBH}, $al->artist, 'artist', 0);
xml_release($ar, $al, 0);
}
elsif ($rel->{type} eq 'label')
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Release.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Release.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -180,7 +180,7 @@
if (@albums && !$ar && $inc & INC_ARTIST || $inc & INC_TRACKS)
{
$ar = MusicBrainz::Server::Artist->new($mb->{DBH});
- $ar->SetId($al->GetArtist);
+ $ar->SetId($al->artist);
$ar->LoadFromId();
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Track.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Track.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Track.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -170,7 +170,7 @@
if ($inc & INC_ARTIST || $inc & INC_RELEASES)
{
$ar = MusicBrainz::Server::Artist->new($mb->{DBH});
- $ar->SetId($tr->GetArtist);
+ $ar->SetId($tr->artist);
$ar = undef unless $ar->LoadFromId(1);
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -890,7 +890,7 @@
require MusicBrainz::Server::Release;
my $album = MusicBrainz::Server::Release->new($this->{DBH});
$album->SetId($row[0]);
- $album->SetArtist($row[1]);
+ $album->artist($row[1]);
$album->SetName($row[2]);
$album->SetModPending($row[3]);
$album->SetMBId($row[4]);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ModBot.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ModBot.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ModBot.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -272,10 +272,10 @@
# The mod has expired, so see if anyone (other than the moderator) is
# subscribed to the artist. If so, allow the mod to stay open
# some more (the grace period).
- my $subscribers = $artist_subscribers{$mod->GetArtist} ||= do {
+ my $subscribers = $artist_subscribers{$mod->artist} ||= do {
require UserSubscription;
my $us = UserSubscription->new($this->{DBH});
- [ $us->GetSubscribersForArtist($mod->GetArtist) ];
+ [ $us->GetSubscribersForArtist($mod->artist) ];
};
# Any subscribers other than the original moderator?
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Release.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Release.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -64,7 +64,7 @@
$export->{artist} = MusicBrainz::Server::Facade::Artist->new({
name => $_->{artistname},
- mbid => $_->GetArtist
+ mbid => $_->artist
});
$export->{catalog_number} = $_->{catno};
@@ -157,10 +157,10 @@
{
my ($type, $status) = $release->GetReleaseTypeAndStatus;
- $release->SetMultipleTrackArtists($release->GetArtist != $release->GetId() ? 1 : 0);
+ $release->SetMultipleTrackArtists($release->artist != $release->GetId() ? 1 : 0);
$release->{_firstreleasedate_} = ($release->GetFirstReleaseDate || "9999-99-99");
- $release->{_is_va_} = ($release->GetArtist == &ModDefs::VARTIST_ID) or
- ($release->GetArtist != $release->GetId());
+ $release->{_is_va_} = ($release->artist == &ModDefs::VARTIST_ID) or
+ ($release->artist != $release->GetId());
$release->{_is_nonalbum_} = $type && $type == MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS;
$release->{_section_key_} = (defined $type ? $release->{_is_va_} . " " . $type : $release->{_is_va});
$release->{_name_sort_} = lc decode "utf-8", $release->GetName;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -124,7 +124,7 @@
$self->table('artist');
$self->SetColumn('name');
- $self->SetArtist($info{'artist_insertid'});
+ $self->artist($info{'artist_insertid'});
$self->row_id($info{'artist_insertid'});
$self->SetNew($self->ConvertHashToNew(\%new));
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -59,7 +59,7 @@
die $self;
}
- $self->SetArtist($ar->GetId);
+ $self->artist($ar->GetId);
$self->SetPrev($ar->GetName);
$self->SetNew($newalias);
$self->table("artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST_ANNOTATION.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST_ANNOTATION.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST_ANNOTATION.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -47,7 +47,7 @@
ChangeLog => $changelog,
);
- $self->SetArtist($artistid);
+ $self->artist($artistid);
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('artist');
$self->SetColumn('annotation.text');
@@ -90,7 +90,7 @@
$an->moderator($self->moderator());
$an->moderation($self->GetId());
$an->type(ARTIST_ANNOTATION);
- $an->SetArtist($self->row_id());
+ $an->artist($self->row_id());
$an->text($text);
$an->change_log($changelog);
$an->Insert();
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -59,7 +59,7 @@
$self->table("album_cdtoc");
$self->SetColumn("album");
$self->row_id($rowid);
- $self->SetArtist($al->GetArtist);
+ $self->artist($al->artist);
my %new = (
AlbumName => $al->GetName,
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -77,20 +77,20 @@
if (@$entities[0]->{type} eq 'album' || @$entities[0]->{type} eq 'track')
{
- my $artistid = @$entities[0]->{obj}->GetArtist;
+ my $artistid = @$entities[0]->{obj}->artist;
# Don't assign the edit to VA if we don't have to
if ($artistid == VARTIST_ID && @$entities[1]->{type} eq 'artist')
{
- $self->SetArtist(@$entities[1]->{obj}->GetId);
+ $self->artist(@$entities[1]->{obj}->GetId);
}
else
{
- $self->SetArtist($artistid);
+ $self->artist($artistid);
}
}
elsif (@$entities[0]->{type} ne 'label')
{
- $self->SetArtist(@$entities[0]->{obj}->GetId);
+ $self->artist(@$entities[0]->{obj}->GetId);
}
$self->table($link->Table);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_ATTR.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_ATTR.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_ATTR.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -54,7 +54,7 @@
my $child = $parent->AddChild($name, $desc, $childorder);
- $self->SetArtist(DARTIST_ID);
+ $self->artist(DARTIST_ID);
$self->table($parent->{_table});
$self->SetColumn("name");
$self->row_id($child->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_TYPE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_TYPE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_TYPE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -72,7 +72,7 @@
$description, $attribute, $childorder, $shortlinkphrase,
$priority);
- $self->SetArtist(DARTIST_ID);
+ $self->artist(DARTIST_ID);
$self->table($parent->{_table}); # FIXME internal field
$self->SetColumn("name");
$self->row_id($child->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -53,7 +53,7 @@
# Force a deliberately bad value to start with - this makes it obvious if
# we somehow fail to insert a good value later on.
- $self->SetArtist(0);
+ $self->artist(0);
# keys in %new:
# |--- EITHER self->artist OR Artist and Sortname
@@ -102,7 +102,7 @@
# that possible?
if (defined $new{'artist'})
{
- $self->SetArtist($info{'artistid'} = $new{'artist'});
+ $self->artist($info{'artistid'} = $new{'artist'});
}
else
{
@@ -274,7 +274,7 @@
}
}
- $self->SetArtist($new{_artistid} = $info{_artistid} or die);
+ $self->artist($new{_artistid} = $info{_artistid} or die);
$self->row_id($new{_albumid} = $info{_albumid} or die);
# Add a dependency on a pending MOD_ADD_ARTIST if there is one
@@ -283,7 +283,7 @@
(my $artistmodid) = $sql->SelectSingleValue(
"SELECT id FROM moderation_open WHERE type = " . &ModDefs::MOD_ADD_ARTIST
. " AND rowid = ?",
- $self->GetArtist,
+ $self->artist,
);
$new{"Dep0"} = $artistmodid
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -48,7 +48,7 @@
ChangeLog => $changelog,
);
- $self->SetArtist($artistid);
+ $self->artist($artistid);
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('album');
$self->SetColumn('annotation.text');
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_ANNOTATION.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_ANNOTATION.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_ANNOTATION.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -48,7 +48,7 @@
ChangeLog => $changelog,
);
- $self->SetArtist($artistid);
+ $self->artist($artistid);
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('track');
$self->SetColumn('annotation.text');
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -66,12 +66,12 @@
my $artistid = $opts{'artistid'};
# TrackArtist
- my $hastrackartist = $release->GetArtist == &ModDefs::VARTIST_ID or
+ my $hastrackartist = $release->artist == &ModDefs::VARTIST_ID or
$release->HasMultipleTrackArtists;
if (not $artistid)
{
$artistid = $artist->GetId if ($artist);
- $artistid = $release->GetArtist if ($release);
+ $artistid = $release->artist if ($release);
}
die if ($hastrackartist and not $artistid);
@@ -148,7 +148,7 @@
$self->table("track");
$self->SetColumn("name");
- $self->SetArtist($artistid); # use track artist (or release artist if no track artist)
+ $self->artist($artistid); # use track artist (or release artist if no track artist)
$self->row_id($newtrackid);
$self->SetPrev($release->GetName);
$self->SetNew($self->ConvertHashToNew(\%new));
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -40,7 +40,7 @@
my $artist = $opts{'artist'} or die;
my $quality = $opts{'quality'};
- $self->SetArtist($artist->GetId);
+ $self->artist($artist->GetId);
$self->SetPrev($artist->quality);
$self->SetNew($quality);
$self->table("artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -60,7 +60,7 @@
$new{"ReleaseName$seq"} = $al->GetName;
$new{"Prev$seq"} = $prev;
- ++$artists{$al->GetArtist};
+ ++$artists{$al->artist};
++$seq;
}
@@ -75,10 +75,10 @@
# If all n releases are stored under artist x use this
# artist as the moderation artist, else VA.
$self->row_id($releases->[0]->GetId) if ($seq == 1);
- $self->SetArtist(
+ $self->artist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
- : $releases->[0]->GetArtist
+ : $releases->[0]->artist
);
$self->table("album");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -46,7 +46,7 @@
$self->table("track");
$self->SetColumn("artist");
$self->row_id($tr->GetId);
- $self->SetArtist($ar->GetId);
+ $self->artist($ar->GetId);
$self->SetPrev($ar->GetName);
$self->SetNew($sortname . "\n" . $name . "\n" . $newartistid);
}
@@ -138,7 +138,7 @@
{
require MusicBrainz::Server::Artist;
$newartist = MusicBrainz::Server::Artist->new($this->{DBH});
- $newartist->SetId($track->GetArtist);
+ $newartist->SetId($track->artist);
if ($newartist->LoadFromId and
$newartist->GetName eq $this->{'new.name'})
{
@@ -155,7 +155,7 @@
# the old one ...
my $oldartist = MusicBrainz::Server::Artist->new($this->{DBH});
- $oldartist->SetId($this->GetArtist);
+ $oldartist->SetId($this->artist);
if ($this->{"old.exists"} = $oldartist->LoadFromId)
{
$this->{"old.resolution"} = $oldartist->resolution;
@@ -196,7 +196,7 @@
}
# Check that its artist has not changed
- if ($track->GetArtist != $self->GetArtist)
+ if ($track->artist != $self->artist)
{
$self->InsertNote(MODBOT_MODERATOR, "This track has already been moved to another artist");
return STATUS_FAILEDPREREQ;
@@ -245,7 +245,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->row_id);
- $track->SetArtist($artistid);
+ $track->artist($artistid);
$track->UpdateArtist
or die "Failed to update track in MOD_CHANGE_TRACK_ARTIST";
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_WIKIDOC.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_WIKIDOC.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_WIKIDOC.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -48,7 +48,7 @@
my %new;
$new{'Rev'} = $rev;
- $self->SetArtist(VARTIST_ID);
+ $self->artist(VARTIST_ID);
$self->SetPrev($self->ConvertHashToNew(\%prev));
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -116,7 +116,7 @@
$prev{'BeginDate'} = $ar->begin_date() if exists $new{'BeginDate'};
$prev{'EndDate'} = $ar->end_date() if exists $new{'EndDate'};
- $self->SetArtist($ar->GetId);
+ $self->artist($ar->GetId);
$self->SetPrev($self->ConvertHashToNew(\%prev));
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -41,7 +41,7 @@
my $newname = $opts{'newname'};
$newname =~ /\S/ or die;
- $self->SetArtist($al->row_id);
+ $self->artist($al->row_id);
$self->SetPrev($al->GetName);
$self->SetNew($newname);
$self->table("artistalias");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -44,7 +44,7 @@
die if $ar->GetId == VARTIST_ID;
die if $ar->GetId == DARTIST_ID;
- $self->SetArtist($ar->GetId);
+ $self->artist($ar->GetId);
$self->SetPrev($ar->GetName);
$self->SetNew($newname);
$self->table("artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -44,7 +44,7 @@
die if $ar->GetId == VARTIST_ID;
die if $ar->GetId == DARTIST_ID;
- $self->SetArtist($ar->GetId);
+ $self->artist($ar->GetId);
$self->SetPrev($ar->sort_name);
$self->SetNew($newname);
$self->table("artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -64,20 +64,20 @@
if (@$entities[0]->{type} eq 'album' || @$entities[0]->{type} eq 'track')
{
- my $artistid = @$entities[0]->{obj}->GetArtist;
+ my $artistid = @$entities[0]->{obj}->artist;
# Don't assign the edit to VA if we don't have to
if ($artistid == VARTIST_ID && @$entities[1]->{type} eq 'artist')
{
- $self->SetArtist(@$entities[1]->{obj}->GetId);
+ $self->artist(@$entities[1]->{obj}->GetId);
}
else
{
- $self->SetArtist($artistid);
+ $self->artist($artistid);
}
}
elsif (@$entities[0]->{type} ne 'label')
{
- $self->SetArtist(@$entities[0]->{obj}->GetId);
+ $self->artist(@$entities[0]->{obj}->GetId);
}
$self->table($link->Table);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_ATTR.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_ATTR.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_ATTR.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -54,7 +54,7 @@
die $self;
}
- $self->SetArtist(DARTIST_ID);
+ $self->artist(DARTIST_ID);
$self->table($node->{_table});
$self->SetColumn("name");
$self->row_id($node->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_TYPE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_TYPE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_TYPE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -70,7 +70,7 @@
die $self;
}
- $self->SetArtist(DARTIST_ID);
+ $self->artist(DARTIST_ID);
$self->table($node->{_table}); # FIXME internal field
$self->SetColumn("name");
$self->row_id($node->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -89,7 +89,7 @@
$fCanAutoMod = 0
if defined($s) and $s != $status;
- ++$artists{$al->GetArtist};
+ ++$artists{$al->artist};
++$seq;
}
@@ -105,10 +105,10 @@
# If all n releases are stored under artist x use this
# artist as the moderation artist, else VA.
$self->row_id($albums->[0]->GetId) if ($seq == 1);
- $self->SetArtist(
+ $self->artist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
- : $albums->[0]->GetArtist
+ : $albums->[0]->artist
);
$self->table("album");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -133,7 +133,7 @@
return $self->SuppressInsert
unless @adds or @edits or @removes;
- $self->SetArtist($al->GetArtist);
+ $self->artist($al->artist);
$self->SetPrev($al->GetName);
$self->table("album");
$self->SetColumn("releases");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -66,7 +66,7 @@
$fCanAutoMod = 0 if $curr_lang and $languageid != $curr_lang;
$fCanAutoMod = 0 if $curr_script and $scriptid != $curr_script;
- ++$artists{$al->GetArtist};
+ ++$artists{$al->artist};
++$seq;
}
@@ -83,10 +83,10 @@
# If all n releases are stored under artist x use this
# artist as the moderation artist, else VA.
$self->row_id($albums->[0]->GetId) if ($seq == 1);
- $self->SetArtist(
+ $self->artist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
- : $albums->[0]->GetArtist
+ : $albums->[0]->artist
);
$self->table("album");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -41,7 +41,7 @@
my $newname = $opts{'newname'};
$newname =~ /\S/ or die;
- $self->SetArtist($release->GetArtist);
+ $self->artist($release->artist);
$self->SetPrev($release->GetName);
$self->SetNew($newname);
$self->table("album");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -41,7 +41,7 @@
my $newname = $opts{'newname'};
$newname =~ /\S/ or die;
- $self->SetArtist($track->GetArtist);
+ $self->artist($track->artist);
$self->SetPrev($track->GetName);
$self->SetNew($newname);
$self->table("track");
@@ -91,7 +91,7 @@
# if that fails, go by the artist
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($tr->GetArtist());
+ $ar->SetId($tr->artist());
if ($ar->LoadFromId())
{
return $ar->quality;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -40,7 +40,7 @@
my $track = $opts{'track'} or die;
my $newseq = $opts{'newseq'} or die;
- $self->SetArtist($track->GetArtist);
+ $self->artist($track->artist);
$self->SetPrev($track->GetSequence);
$self->SetNew(0+$newseq);
$self->table("albumjoin");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -40,7 +40,7 @@
my $track = $opts{'track'} or die;
my $newlength = $opts{'newlength'};
- $self->SetArtist($track->GetArtist);
+ $self->artist($track->artist);
$self->SetPrev($track->GetLength);
$self->SetNew(0+$newlength);
$self->table("track");
@@ -88,7 +88,7 @@
# if that fails, go by the artist
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($tr->GetArtist());
+ $ar->SetId($tr->artist());
if ($ar->LoadFromId())
{
return $ar->quality;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -66,7 +66,7 @@
{
my $album = MusicBrainz::Server::Release->new($self->{DBH});
$album->SetId($links[0]->{link0_id});
- $artist = $album->GetArtist
+ $artist = $album->artist
if ($album->LoadFromId(0));
}
}
@@ -80,12 +80,12 @@
{
my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($links[0]->{link0_id});
- $artist = $track->GetArtist
+ $artist = $track->artist
if ($track->LoadFromId(0));
}
}
- $self->SetArtist($artist) if $artist;
+ $self->artist($artist) if $artist;
$self->SetPrev($self->ConvertHashToNew(\%prev));
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("url");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -53,7 +53,7 @@
$self->table("album");
$self->SetColumn("artist");
- $self->SetArtist($al->GetArtist);
+ $self->artist($al->artist);
$self->row_id($al->GetId);
$self->SetNew($new);
}
@@ -130,7 +130,7 @@
{
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
- $ar->SetId($al->GetArtist);
+ $ar->SetId($al->artist);
if ($ar->LoadFromId
&& $ar->GetName eq $this->{'new.name'})
{
@@ -160,7 +160,7 @@
# album needs to have more than one track artist
# if it is not VA to allow a SA-conversion
- if ($al->GetArtist != VARTIST_ID and
+ if ($al->artist != VARTIST_ID and
not $al->HasMultipleTrackArtists)
{
$self->InsertNote(MODBOT_MODERATOR, "This release has already been converted to a single artist");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -56,7 +56,7 @@
$self->table("artist");
$self->SetColumn("name");
- $self->SetArtist($source->GetId);
+ $self->artist($source->GetId);
$self->row_id($source->GetId);
$self->SetPrev($source->GetName);
$self->SetNew($self->ConvertHashToNew(\%new));
@@ -148,7 +148,7 @@
}
} else {
# Load new artist by name
- my $artists = $newar->GetArtistsFromName($name);
+ my $artists = $newar->select_artists_by_name($name);
if (scalar(@$artists) == 0)
{
$self->InsertNote(MODBOT_MODERATOR, "Artist '$name' not found - it has been deleted or renamed");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -65,7 +65,7 @@
$new{"merge_attributes"} = 1 if $opts{"merge_attributes"};
$new{"merge_langscript"} = 1 if $opts{"merge_langscript"};
- $self->SetArtist($into->GetArtist);
+ $self->artist($into->artist);
$self->table("album");
$self->SetColumn("id");
$self->row_id($into->GetId);
@@ -120,7 +120,7 @@
$rel->SetId($new->{"AlbumId$i"});
if ($rel->LoadFromId())
{
- $artistid = $rel->GetArtist() if ($artistid < 0);
+ $artistid = $rel->artist() if ($artistid < 0);
$quality = $rel->quality > $quality ? $rel->quality : $quality;
}
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -99,7 +99,7 @@
$self->table("album_cdtoc");
$self->SetColumn("album");
$self->row_id($alcdtoc->GetId);
- $self->SetArtist($oldal->GetArtist);
+ $self->artist($oldal->artist);
$self->SetPrev($oldal->GetId);
my %new = (
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -53,7 +53,7 @@
$self->table("album");
$self->SetColumn("artist");
- $self->SetArtist($release->GetArtist);
+ $self->artist($release->artist);
$self->row_id($release->GetId);
$self->SetPrev($artist->GetName);
$self->SetNew($new);
@@ -92,7 +92,7 @@
}
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($rel->GetArtist);
+ $ar->SetId($rel->artist);
if ($ar->LoadFromId())
{
$level = $ar->quality > $level ? $ar->quality : $level;
@@ -134,7 +134,7 @@
{
require MusicBrainz::Server::Artist;
$newartist = MusicBrainz::Server::Artist->new($this->{DBH});
- $newartist->SetId($release->GetArtist);
+ $newartist->SetId($release->artist);
# FIXME is the name = new.sortname comparison necessary?
if ($newartist->LoadFromId
@@ -156,7 +156,7 @@
{
my $oar = MusicBrainz::Server::Artist->new($this->{DBH});
# the old one ...
- $oar->SetId($this->GetArtist);
+ $oar->SetId($this->artist);
$oar->LoadFromId
and $this->{'old.res'} = $oar->resolution;
@@ -205,7 +205,7 @@
$sql->SelectSingleValue(
"SELECT 1 FROM album WHERE id = ? AND artist = ?",
$this->row_id,
- $this->GetArtist,
+ $this->artist,
) or do {
$this->InsertNote(MODBOT_MODERATOR, "This release has already been deleted or moved");
return STATUS_FAILEDPREREQ;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -41,7 +41,7 @@
die if $ar->GetId == VARTIST_ID;
die if $ar->GetId == DARTIST_ID;
- $self->SetArtist($ar->GetId);
+ $self->artist($ar->GetId);
$self->SetPrev($ar->GetName);
$self->table("artist");
$self->SetColumn("name");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -40,7 +40,7 @@
my $artist = $opts{'artist'} or die;
my $alias = $opts{'alias'} or die;
- $self->SetArtist($artist->GetId);
+ $self->artist($artist->GetId);
$self->SetPrev($alias->GetName);
$self->table("artistalias");
$self->SetColumn("name");
@@ -52,7 +52,7 @@
my $self = shift;
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($self->GetArtist);
+ $ar->SetId($self->artist);
if ($ar->LoadFromId())
{
return $ar->quality;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -74,7 +74,7 @@
$self->table("album_cdtoc");
$self->SetColumn("album");
$self->row_id($alcdtoc->GetId);
- $self->SetArtist($oldrelease->GetArtist);
+ $self->artist($oldrelease->artist);
$self->SetPrev($cdtoc->disc_id);
my %new = (
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -46,11 +46,11 @@
if ($types->[0] eq 'album' || $types->[0] eq 'track')
{
- $self->SetArtist($ents[0]->GetArtist);
+ $self->artist($ents[0]->artist);
}
elsif ($types->[0] ne 'label')
{
- $self->SetArtist($ents[0]->GetId);
+ $self->artist($ents[0]->GetId);
}
$self->table($link->Table);
$self->SetColumn("id");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_ATTR.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_ATTR.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_ATTR.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -46,7 +46,7 @@
die $self;
}
- $self->SetArtist(DARTIST_ID);
+ $self->artist(DARTIST_ID);
$self->table($node->{_table});
$self->SetColumn("name");
$self->row_id($node->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_TYPE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_TYPE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_TYPE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -54,7 +54,7 @@
die $self;
}
- $self->SetArtist(DARTIST_ID);
+ $self->artist(DARTIST_ID);
$self->table($node->{_table}); # FIXME internal field
$self->SetColumn("name");
$self->row_id($node->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -44,7 +44,7 @@
$self->table("puidjoin");
$self->SetColumn("id");
$self->row_id($puidjoinid);
- $self->SetArtist($track->GetArtist);
+ $self->artist($track->artist);
$self->SetPrev($puid);
# Save the PUID's clientversion in case we need to re-add it
@@ -96,7 +96,7 @@
# if that fails, go by the artist
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($tr->GetArtist());
+ $ar->SetId($tr->artist());
if ($ar->LoadFromId())
{
return $ar->quality;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -39,7 +39,7 @@
my $al = $opts{'album'} or die;
- $self->SetArtist($al->GetArtist);
+ $self->artist($al->artist);
$self->SetPrev($al->GetName);
$self->table("album");
$self->SetColumn("name");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -55,13 +55,13 @@
my $al = $albums->[$seq];
$new{"AlbumId$seq"} = $al->GetId;
$new{"AlbumName$seq"} = $al->GetName;
- ++$artists{$al->GetArtist};
+ ++$artists{$al->artist};
}
- $self->SetArtist(
+ $self->artist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
- : $albums->[0]->GetArtist
+ : $albums->[0]->artist
);
$self->table("album");
$self->SetColumn("id");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -40,7 +40,7 @@
my $tr = $opts{'track'} or die;
my $al = $opts{'album'} or die;
- $self->SetArtist($tr->GetArtist);
+ $self->artist($tr->artist);
$self->SetPrev($tr->GetName . "\n" . $al->GetId . "\n" . $al->IsNonAlbumTracks . "\n" . $tr->GetSequence . "\n" . $tr->GetLength);
$self->table("track");
$self->SetColumn("name");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -44,7 +44,7 @@
$self->table("trmjoin");
$self->SetColumn("id");
$self->row_id($trmjoinid);
- $self->SetArtist($track->GetArtist);
+ $self->artist($track->artist);
$self->SetPrev($trm);
# Save the TRM's clientversion in case we need to re-add it
@@ -96,7 +96,7 @@
# if that fails, go by the artist
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($tr->GetArtist());
+ $ar->SetId($tr->artist());
if ($ar->LoadFromId())
{
return $ar->quality;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -41,7 +41,7 @@
my $ar = $opts{artist} or die;
my $movetova = $opts{movetova} or die;
- if ($al->GetArtist == VARTIST_ID)
+ if ($al->artist == VARTIST_ID)
{
$self->SetError("This is already a 'Various Artists' release");
die $self;
@@ -49,7 +49,7 @@
$self->table("album");
$self->SetColumn("artist");
- $self->SetArtist($al->GetArtist);
+ $self->artist($al->artist);
$self->row_id($al->GetId);
$self->SetPrev($ar->GetName);
$self->SetNew($movetova);
@@ -78,7 +78,7 @@
}
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($rel->GetArtist);
+ $ar->SetId($rel->artist);
if ($ar->LoadFromId())
{
$level = $ar->quality > $level ? $ar->quality : $level;
@@ -102,12 +102,12 @@
}
# Check that its artist has not changed
- if ($release->GetArtist == VARTIST_ID)
+ if ($release->artist == VARTIST_ID)
{
$self->InsertNote(MODBOT_MODERATOR, "This release has already been converted to multiple artists");
return STATUS_FAILEDPREREQ;
}
- if ($release->GetArtist != $self->GetArtist)
+ if ($release->artist != $self->artist)
{
$self->InsertNote(MODBOT_MODERATOR, "This release is no longer associated with this artist");
return STATUS_FAILEDDEP;
@@ -136,7 +136,7 @@
"UPDATE album SET artist = ? WHERE id = ? AND artist = ?",
&ModDefs::VARTIST_ID,
$self->row_id,
- $self->GetArtist,
+ $self->artist,
) or die "Failed to update album in MOD_SAC_TO_MAC";
&ModDefs::STATUS_APPLIED;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -78,7 +78,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->SetPrev($prevdurs);
- $self->SetArtist($release->GetArtist);
+ $self->artist($release->artist);
$self->table("album");
$self->SetColumn("cdtoc.text");
$self->row_id($release->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -98,14 +98,12 @@
}
# Accessor functions to set/get the artist id of this album
-sub GetArtist
+sub artist
{
- return $_[0]->{artist};
-}
+ my ($self, $new_artist) = @_;
-sub SetArtist
-{
- $_[0]->{artist} = $_[1];
+ if (defined $new_artist) { $self->{artist} = $new_artist; }
+ return $self->{artist};
}
sub language_id
@@ -271,7 +269,7 @@
sub FindNonAlbum
{
my ($this, $artist) = @_;
- $artist ||= $this->GetArtist;
+ $artist ||= $this->artist;
my $sql = Sql->new($this->{DBH});
my $ids = $sql->SelectSingleColumnArray(
@@ -351,7 +349,7 @@
sub GetOrInsertNonAlbum
{
my ($this, $artist) = @_;
- $artist ||= $this->GetArtist;
+ $artist ||= $this->artist;
my @albums = $this->FindNonAlbum($artist);
@@ -364,7 +362,7 @@
# There doesn't seem to be a non-album for this artist, so we'll
# insert one.
- $this->SetArtist($artist);
+ $this->artist($artist);
$this->SetName(&NONALBUMTRACKS_NAME);
$this->attributes(&RELEASE_ATTR_NONALBUMTRACKS);
my $id = $this->Insert;
@@ -782,12 +780,12 @@
$track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($row[0]);
$track->SetName($row[1]);
- $track->SetArtist($row[2]);
+ $track->artist($row[2]);
$track->SetSequence($row[3]);
$track->SetLength($row[4]);
$track->SetModPending($row[5]);
$track->SetAlbumJoinModPending($row[6]);
- $track->SetArtistName($row[7]);
+ $track->artist_name($row[7]);
$track->SetMBId($row[8]);
$track->SetRelease($row[9]);
push @info, $track;
@@ -854,14 +852,14 @@
# different than the release artist. we still diplay
# the track artists in that case.
- $ar{$self->GetArtist} = 1;
+ $ar{$self->artist} = 1;
# get the list of tracks and get their respective
# artistid.
$tracks = $self->GetTracks;
foreach my $t (@$tracks)
{
- $ar{$t->GetArtist} = 1;
+ $ar{$t->artist} = 1;
}
$self->{"_isva"} = (keys %ar > 1);
}
@@ -1034,7 +1032,7 @@
# Move that the track to the target album's artist
$sql->Do(
"UPDATE track SET artist = ? WHERE id = ?",
- $this->GetArtist,
+ $this->artist,
$tr->GetId,
);
}
@@ -1054,7 +1052,7 @@
# And the annotations
require MusicBrainz::Server::Annotation;
- MusicBrainz::Server::Annotation->MergeReleases($this->{DBH}, $id, $this->GetId, artistid => $this->GetArtist);
+ MusicBrainz::Server::Annotation->MergeReleases($this->{DBH}, $id, $this->GetId, artistid => $this->artist);
# And the ARs
$link->MergeReleases($id, $this->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -50,25 +50,21 @@
}
# Accessor functions to set/get the artist id of this album
-sub GetArtist
+sub artist
{
- return $_[0]->{artist};
-}
+ my ($self, $new_artist) = @_;
-sub SetArtist
-{
- $_[0]->{artist} = $_[1];
+ if (defined $new_artist) { $self->{artist} = $new_artist; }
+ return $self->{artist};
}
# This is only used for tracks from multiple artist albums
-sub GetArtistName
+sub artist_name
{
- return $_[0]->{artistname};
-}
+ my ($self, $new_name) = @_;
-sub SetArtistName
-{
- $_[0]->{artistname} = $_[1];
+ if (defined $new_name) { $self->{artistname} = $new_name; }
+ return $self->{artistname};
}
sub GetRelease
@@ -263,7 +259,7 @@
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
- $ar->SetId($this->GetArtist());
+ $ar->SetId($this->artist());
if (!defined $ar->LoadFromId())
{
return ();
@@ -340,8 +336,8 @@
# If an artist is given, we assume that this one
# should be used to attribute the track to.
# -- (keschte)
- my $artist = ($al->GetArtist() == &ModDefs::VARTIST_ID or
- defined $ar) ? $ar->GetId() : $al->GetArtist();
+ my $artist = ($al->artist() == &ModDefs::VARTIST_ID or
+ defined $ar) ? $ar->GetId() : $al->artist();
if (not $artist)
{
@@ -440,7 +436,7 @@
$sql->Do(
"UPDATE track SET artist = ? WHERE id = ?",
- $self->GetArtist,
+ $self->artist,
$self->GetId,
);
}
Modified: mb_server/branches/TemplateToolkit/lib/QuerySupport.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/QuerySupport.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/QuerySupport.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -217,13 +217,13 @@
}
# returns artistList
-sub GetArtistByGlobalId
+sub select_artist_by_guid
{
my ($dbh, $parser, $rdf, $id) = @_;
if (not defined $id or $id eq "")
{
- carp "Missing artist GUID in GetArtistByGlobalId";
+ carp "Missing artist GUID in select_artist_by_guid";
return $rdf->ErrorRDF("No artist GUID given");
}
@@ -1201,13 +1201,13 @@
}
# returns artistList
-sub GetArtistRelationships
+sub artist_relationships
{
my ($dbh, $parser, $rdf, $id) = @_;
if (not defined $id or $id eq "")
{
- carp "Missing artist GUID in GetArtistRelationships";
+ carp "Missing artist GUID in artist_relationships";
return $rdf->ErrorRDF("No artist GUID given");
}
Modified: mb_server/branches/TemplateToolkit/lib/TaggerSupport.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/TaggerSupport.pm 2008-09-01 23:49:09 UTC (rev 10290)
+++ mb_server/branches/TemplateToolkit/lib/TaggerSupport.pm 2008-09-01 23:52:32 UTC (rev 10291)
@@ -360,7 +360,7 @@
require MusicBrainz::Server::Artist;
$ar = MusicBrainz::Server::Artist->new($this->{DBH});
- my $artists = $ar->GetArtistsFromName($name);
+ my $artists = $ar->select_artists_by_name($name);
if (scalar(@$artists) == 1)
{
$this->{artist} = $$artists[0];
@@ -468,7 +468,7 @@
# first check, if there are any exact matches for artist & album
require MusicBrainz::Server::Release;
$al = MusicBrainz::Server::Release->new($this->{DBH});
- $al->SetArtist($ar->GetId());
+ $al->artist($ar->GetId());
my (@aids) = $al->GetAlbumListFromName($name);
my @albums;
More information about the MusicBrainz-commits
mailing list