[mb-commits] r10274 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server MusicBrainz/Server/Controller MusicBrainz/Server/Moderation
root at musicbrainz.org
root at musicbrainz.org
Mon Sep 1 23:35:47 UTC 2008
Author: acid2
Date: 2008-09-01 23:35:47 +0000 (Mon, 01 Sep 2008)
New Revision: 10274
Modified:
mb_server/branches/TemplateToolkit/lib/Insert.pm
mb_server/branches/TemplateToolkit/lib/Moderation.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Alias.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.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_LABEL.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.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_LABEL.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.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_LABEL.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_LABEL.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.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
Log:
GetRowId, SetRowId -> row_id (in Alias and Moderation)
Modified: mb_server/branches/TemplateToolkit/lib/Insert.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -672,7 +672,7 @@
) if defined $opts{"FreedbId"}
and defined $opts{"FreedbCat"};
- ($mod->GetArtist, $mod->GetRowId, \@mods);
+ ($mod->GetArtist, $mod->row_id, \@mods);
};
if ($@)
Modified: mb_server/branches/TemplateToolkit/lib/Moderation.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Moderation.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/Moderation.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -751,14 +751,12 @@
$_[0]->{column} = $_[1];
}
-sub GetRowId
+sub row_id
{
- return $_[0]->{rowid};
-}
+ my ($self, $new_id) = @_;
-sub SetRowId
-{
- $_[0]->{rowid} = $_[1];
+ if (defined $new_id) { $self->{rowid} = $new_id; }
+ return $self->{rowid};
}
sub GetDepMod
@@ -905,7 +903,7 @@
$edit->SetId($row[0]);
$edit->table($row[1]);
$edit->SetColumn($row[2]);
- $edit->SetRowId($row[3]);
+ $edit->row_id($row[3]);
$edit->SetArtist($row[4]);
$edit->type($row[5]);
$edit->SetPrev($row[6]);
@@ -1110,7 +1108,7 @@
$this->SetArtist(&ModDefs::VARTIST_ID);
$this->table("");
$this->SetColumn("");
- $this->SetRowId(0);
+ $this->row_id(0);
$this->SetDepMod(0);
$this->SetPrev("");
$this->SetNew("");
@@ -1157,7 +1155,7 @@
?,
?, NOW() + INTERVAL ?, 0, 0, 0, ?
)",
- $this->table, $this->GetColumn, $this->GetRowId,
+ $this->table, $this->GetColumn, $this->row_id,
$this->GetPrev, $this->GetNew,
$this->GetModerator, $this->GetArtist, $this->type,
$this->GetDepMod,
@@ -1358,7 +1356,7 @@
$edit->SetColumn($r->{col});
$edit->type($r->{type});
$edit->SetStatus($r->{status});
- $edit->SetRowId($r->{rowid});
+ $edit->row_id($r->{rowid});
$edit->SetPrev($r->{prevvalue});
$edit->SetNew($r->{newvalue});
$edit->SetYesVotes($r->{yesvotes});
@@ -1951,7 +1949,7 @@
$sql->Do(
"UPDATE $table SET modpending = modpending + ? WHERE id = ?",
$adjust,
- $this->GetRowId,
+ $this->row_id,
);
}
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Alias.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Alias.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Alias.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -48,14 +48,12 @@
return $self->{table};
}
-sub GetRowId
+sub row_id
{
- return $_[0]->{rowid};
-}
+ my ($self, $new_row_id) = @_;
-sub SetRowId
-{
- $_[0]->{rowid} = $_[1];
+ if (defined $new_row_id) { $self->{rowid} = $new_row_id; }
+ return $self->{rowid};
}
sub GetLastUsed
@@ -155,7 +153,7 @@
my $name = $self->GetName;
defined($name) && $name ne ""
or croak "Missing alias name in UpdateName";
- my $rowid = $self->GetRowId
+ my $rowid = $self->row_id
or croak "Missing row ID in UpdateName";
MusicBrainz::Server::Validation::TrimInPlace($name);
@@ -325,7 +323,7 @@
$alias->{table} = $this->{table};
$alias->SetId($row[0]);
$alias->SetName($row[1]);
- $alias->SetRowId($row[2]);
+ $alias->row_id($row[2]);
$alias->SetLastUsed($row[3]);
$alias->SetTimesUsed($row[4]);
push @info, $alias;
@@ -353,9 +351,9 @@
my $parentclass = $this->ParentClass;
eval "require $parentclass; 1" or die $@;
my $parent = $parentclass->new($this->{DBH});
- $parent->SetId($this->GetRowId);
+ $parent->SetId($this->row_id);
$parent->LoadFromId
- or die "Couldn't load $parentclass #" . $this->GetRowId;
+ or die "Couldn't load $parentclass #" . $this->row_id;
$parent;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -238,7 +238,7 @@
# the new artist
my $addmod = grep { $_->Type eq ModDefs::MOD_ADD_ARTIST } @$mods;
- $c->detach('/artist/show', $addmod->GetRowId)
+ $c->detach('/artist/show', $addmod->row_id)
if $addmod;
}
}
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -125,7 +125,7 @@
$self->table('artist');
$self->SetColumn('name');
$self->SetArtist($info{'artist_insertid'});
- $self->SetRowId($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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -49,7 +49,7 @@
if (my $other = $al->newFromName($newalias))
{
my $url = "http://" . &DBDefs::WEB_SERVER
- . "/showaliases.html?artistid=" . $other->GetRowId;
+ . "/showaliases.html?artistid=" . $other->row_id;
my $note = "There is already an alias called '$newalias'"
. " (see $url)"
@@ -64,7 +64,7 @@
$self->SetNew($newalias);
$self->table("artist");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
sub DetermineQuality
@@ -87,7 +87,7 @@
# Check that the referenced artist is still around
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($self->GetRowId);
+ $ar->SetId($self->row_id);
unless ($ar->LoadFromId)
{
$self->InsertNote(
@@ -105,7 +105,7 @@
if (my $other = $al->newFromName($self->GetNew))
{
my $url = "http://" . &DBDefs::WEB_SERVER
- . "/showaliases.html?artistid=" . $other->GetRowId;
+ . "/showaliases.html?artistid=" . $other->row_id;
my $note = "There is already an alias called '".$self->GetNew."'"
. " (see $url)"
@@ -130,7 +130,7 @@
$al->table("ArtistAlias");
my $other;
- if ($al->Insert($self->GetRowId, $self->GetNew, \$other))
+ if ($al->Insert($self->row_id, $self->GetNew, \$other))
{
return STATUS_APPLIED;
}
@@ -142,7 +142,7 @@
if ($!{EEXIST})
{
my $url = "http://" . &DBDefs::WEB_SERVER
- . "/showaliases.html?artistid=" . $other->GetRowId;
+ . "/showaliases.html?artistid=" . $other->row_id;
my $newname = $self->GetNew;
$message = "There is already an alias called '$newname' (see $url)"
. " - duplicate aliases are not yet supported";
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST_ANNOTATION.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -51,7 +51,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('artist');
$self->SetColumn('annotation.text');
- $self->SetRowId($artistid);
+ $self->row_id($artistid);
}
sub IsAutoEdit
@@ -90,7 +90,7 @@
$an->SetModerator($self->GetModerator());
$an->SetModeration($self->GetId());
$an->type(ARTIST_ANNOTATION);
- $an->SetArtist($self->GetRowId());
+ $an->SetArtist($self->row_id());
$an->SetText($text);
$an->SetChangeLog($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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -58,7 +58,7 @@
$self->table("album_cdtoc");
$self->SetColumn("album");
- $self->SetRowId($rowid);
+ $self->row_id($rowid);
$self->SetArtist($al->GetArtist);
my %new = (
@@ -98,7 +98,7 @@
$sql->Do(
"UPDATE album_cdtoc SET modpending = modpending + ? WHERE id = ?",
$adjust,
- $self->GetRowId,
+ $self->row_id,
);
}
@@ -113,7 +113,7 @@
require MusicBrainz::Server::ReleaseCDTOC;
- my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId);
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->row_id);
if (not $alcdtoc)
{
$self->InsertNote(MODBOT_MODERATOR, "This disc ID has already been removed");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -122,7 +122,7 @@
$self->table('label');
$self->SetColumn('name');
- $self->SetRowId($labelid);
+ $self->row_id($labelid);
$self->SetNew($self->ConvertHashToNew(\%new));
}
@@ -151,7 +151,7 @@
{
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
- my $id = $self->GetRowId;
+ my $id = $self->row_id;
require MusicBrainz::Server::Label;
my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,7 +45,7 @@
$self->SetNew($newalias);
$self->table("label");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
sub CheckPrerequisites
@@ -55,7 +55,7 @@
# Check that the referenced label is still around
require MusicBrainz::Server::Label;
my $ar = MusicBrainz::Server::Label->new($self->{DBH});
- $ar->SetId($self->GetRowId);
+ $ar->SetId($self->row_id);
unless ($ar->LoadFromId)
{
$self->InsertNote(
@@ -86,7 +86,7 @@
$al->table("LabelAlias");
my $other;
- if ($al->Insert($self->GetRowId, $self->GetNew, \$other, 1))
+ if ($al->Insert($self->row_id, $self->GetNew, \$other, 1))
{
return STATUS_APPLIED;
}
@@ -102,7 +102,7 @@
{
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
- my $id = $self->GetRowId;
+ my $id = $self->row_id;
require MusicBrainz::Server::Label;
my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -50,7 +50,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('label');
$self->SetColumn('annotation.text');
- $self->SetRowId($labelid);
+ $self->row_id($labelid);
}
sub IsAutoEdit
@@ -90,7 +90,7 @@
$an->SetModerator($self->GetModerator());
$an->SetModeration($self->GetId());
$an->type(LABEL_ANNOTATION);
- $an->SetLabel($self->GetRowId());
+ $an->SetLabel($self->row_id());
$an->SetText($text);
$an->SetChangeLog($changelog);
$an->Insert();
@@ -102,7 +102,7 @@
{
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
- my $id = $self->GetRowId;
+ my $id = $self->row_id;
require MusicBrainz::Server::Label;
my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -95,7 +95,7 @@
$self->table($link->Table);
$self->SetColumn("id");
- $self->SetRowId($link->GetId);
+ $self->row_id($link->GetId);
my %new = (
linkid=>$link->GetId,
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_ATTR.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -57,7 +57,7 @@
$self->SetArtist(DARTIST_ID);
$self->table($parent->{_table});
$self->SetColumn("name");
- $self->SetRowId($child->GetId);
+ $self->row_id($child->GetId);
my %new = (
parent => $parent->GetMBId,
@@ -86,7 +86,7 @@
my $link = MusicBrainz::Server::LinkAttr->new(
$self->{DBH},
);
- my $child = $link->newFromId($self->GetRowId);
+ my $child = $link->newFromId($self->row_id);
if ($child->InUse)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_LINK_TYPE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -75,7 +75,7 @@
$self->SetArtist(DARTIST_ID);
$self->table($parent->{_table}); # FIXME internal field
$self->SetColumn("name");
- $self->SetRowId($child->GetId);
+ $self->row_id($child->GetId);
my %new = (
types => $parent->PackTypes,
@@ -111,7 +111,7 @@
$self->{DBH},
$new->{'types'},
);
- my $child = $link->newFromId($self->GetRowId);
+ my $child = $link->newFromId($self->row_id);
if ($child->InUse)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -275,7 +275,7 @@
}
$self->SetArtist($new{_artistid} = $info{_artistid} or die);
- $self->SetRowId($new{_albumid} = $info{_albumid} or die);
+ $self->row_id($new{_albumid} = $info{_albumid} or die);
# Add a dependency on a pending MOD_ADD_ARTIST if there is one
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -52,7 +52,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('album');
$self->SetColumn('annotation.text');
- $self->SetRowId($albumid);
+ $self->row_id($albumid);
}
sub IsAutoEdit
@@ -64,7 +64,7 @@
{
my $self = shift;
- ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->GetRowId, 1);
+ ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->row_id, 1);
}
sub PreDisplay
@@ -98,7 +98,7 @@
$an->SetModerator($self->GetModerator());
$an->SetModeration($self->GetId());
$an->type(RELEASE_ANNOTATION);
- $an->SetRelease($self->GetRowId());
+ $an->SetRelease($self->row_id());
$an->SetText($text);
$an->SetChangeLog($changelog);
$an->Insert();
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_ANNOTATION.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -52,7 +52,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table('track');
$self->SetColumn('annotation.text');
- $self->SetRowId($trackid);
+ $self->row_id($trackid);
}
sub IsAutoEdit
@@ -64,7 +64,7 @@
{
my $self = shift;
- ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->GetRowId, 1);
+ ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->row_id, 1);
}
sub PreDisplay
@@ -100,7 +100,7 @@
$an->SetModerator($self->GetModerator());
$an->SetModeration($self->GetId());
$an->type(TRACK_ANNOTATION);
- $an->SetTrack($self->GetRowId());
+ $an->SetTrack($self->row_id());
$an->SetText($text);
$an->SetChangeLog($changelog);
$an->Insert();
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -102,7 +102,7 @@
(my $albummodid) = $sql->SelectSingleValue(
"SELECT id FROM moderation_open WHERE type = "
. &ModDefs::MOD_ADD_RELEASE
- . " AND rowid = ?", $self->GetRowId,
+ . " AND rowid = ?", $self->row_id,
);
$new{'Dep0'} = $albummodid if ($albummodid);
}
@@ -149,7 +149,7 @@
$self->table("track");
$self->SetColumn("name");
$self->SetArtist($artistid); # use track artist (or release artist if no track artist)
- $self->SetRowId($newtrackid);
+ $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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,14 +45,14 @@
$self->SetNew($quality);
$self->table("artist");
$self->SetColumn("quality");
- $self->SetRowId($artist->GetId);
+ $self->row_id($artist->GetId);
}
sub PostLoad
{
my $self = shift;
- ($self->{"artistid"}, $self->{"checkexists-artist"}) = ($self->GetRowId, 1);
+ ($self->{"artistid"}, $self->{"checkexists-artist"}) = ($self->row_id, 1);
}
sub CheckPrerequisites
@@ -62,7 +62,7 @@
# Load the album by ID
require MusicBrainz::Server::Artist;
my $artist = MusicBrainz::Server::Artist->new($self->{DBH});
- $artist->SetId($self->GetRowId);
+ $artist->SetId($self->row_id);
unless ($artist->LoadFromId)
{
$self->InsertNote(MODBOT_MODERATOR, "This artist has been deleted");
@@ -95,7 +95,7 @@
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- $ar->SetId($self->GetRowId);
+ $ar->SetId($self->row_id);
$ar->LoadFromId;
$ar->UpdateQualityModPending($adjust);
}
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -74,7 +74,7 @@
# if in single edit mod, file moderation under release object.
# If all n releases are stored under artist x use this
# artist as the moderation artist, else VA.
- $self->SetRowId($releases->[0]->GetId) if ($seq == 1);
+ $self->row_id($releases->[0]->GetId) if ($seq == 1);
$self->SetArtist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,7 +45,7 @@
$self->table("track");
$self->SetColumn("artist");
- $self->SetRowId($tr->GetId);
+ $self->row_id($tr->GetId);
$self->SetArtist($ar->GetId);
$self->SetPrev($ar->GetName);
$self->SetNew($sortname . "\n" . $name . "\n" . $newartistid);
@@ -113,7 +113,7 @@
# set trackid for ShowModType, checkexists is set to 0,
# because we'll check that in the next couple of lines.
- $this->{"trackid"} = $this->GetRowId;
+ $this->{"trackid"} = $this->row_id;
$this->{"exists-track"} = 0;
$this->{"checkexists-track"} = 0;
@@ -183,7 +183,7 @@
{
my $self = shift;
- my $rowid = $self->GetRowId;
+ my $rowid = $self->row_id;
# Load the track by ID
require MusicBrainz::Server::Track;
@@ -244,7 +244,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($this->{DBH});
- $track->SetId($this->GetRowId);
+ $track->SetId($this->row_id);
$track->SetArtist($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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_CHANGE_WIKIDOC.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -53,7 +53,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("artist");
$self->SetColumn("name");
- $self->SetRowId(VARTIST_ID);
+ $self->row_id(VARTIST_ID);
}
sub PostLoad
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -121,7 +121,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("artist");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
# Specialized version of MusicBrainz::Server::Validation::MakeDBDateStr:
@@ -192,7 +192,7 @@
my $new = $self->{'new_unpacked'};
my $prev = $self->{'prev_unpacked'};
- my $artist_id = $self->GetRowId();
+ my $artist_id = $self->row_id();
if ($artist_id == VARTIST_ID or $artist_id == DARTIST_ID)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -41,12 +41,12 @@
my $newname = $opts{'newname'};
$newname =~ /\S/ or die;
- $self->SetArtist($al->GetRowId);
+ $self->SetArtist($al->row_id);
$self->SetPrev($al->GetName);
$self->SetNew($newname);
$self->table("artistalias");
$self->SetColumn("name");
- $self->SetRowId($al->GetId);
+ $self->row_id($al->GetId);
# Currently there's a unique index on artistalias.name.
# Refuse to insert the mod if that index would be violated.
@@ -92,7 +92,7 @@
require MusicBrainz::Server::Alias;
my $alias = MusicBrainz::Server::Alias->new($self->{DBH}, "artistalias");
- $alias->SetId($self->GetRowId);
+ $alias->SetId($self->row_id);
unless ($alias->LoadFromId)
{
@@ -136,7 +136,7 @@
if ($!{EEXIST})
{
my $url = "http://" . &DBDefs::WEB_SERVER
- . "/showaliases.html?artistid=" . $other->GetRowId;
+ . "/showaliases.html?artistid=" . $other->row_id;
my $newname = $self->GetNew;
$message = "There is already an alias called '$newname' (see $url)"
. " - duplicate aliases are not yet supported";
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -49,7 +49,7 @@
$self->SetNew($newname);
$self->table("artist");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
# We used to perform a duplicate artist check here, but that has been removed.
}
@@ -78,7 +78,7 @@
{
my $self = shift;
- my $rowid = $self->GetRowId;
+ my $rowid = $self->row_id;
if ($rowid == VARTIST_ID or $rowid == DARTIST_ID)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -49,7 +49,7 @@
$self->SetNew($newname);
$self->table("artist");
$self->SetColumn("sortname");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
sub DetermineQuality
@@ -76,7 +76,7 @@
{
my $this = shift;
- my $rowid = $this->GetRowId;
+ my $rowid = $this->row_id;
if ($rowid == VARTIST_ID or $rowid == DARTIST_ID)
{
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -137,7 +137,7 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("label");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
# Specialized version of MusicBrainz::Server::Validation::MakeDBDateStr:
@@ -199,7 +199,7 @@
my $new = $self->{'new_unpacked'};
my $prev = $self->{'prev_unpacked'};
- my $label_id = $self->GetRowId();
+ my $label_id = $self->row_id();
if ($label_id == &ModDefs::DLABEL_ID)
{
@@ -264,7 +264,7 @@
{
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
- my $id = $self->GetRowId;
+ my $id = $self->row_id;
require MusicBrainz::Server::Label;
my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,7 +45,7 @@
$self->SetNew($newname);
$self->table("labelalias");
$self->SetColumn("name");
- $self->SetRowId($al->GetId);
+ $self->row_id($al->GetId);
}
sub IsAutoEdit
@@ -61,7 +61,7 @@
require MusicBrainz::Server::Alias;
my $alias = MusicBrainz::Server::Alias->new($self->{DBH}, "labelalias");
- $alias->SetId($self->GetRowId);
+ $alias->SetId($self->row_id);
unless ($alias->LoadFromId)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -82,7 +82,7 @@
$self->table($link->Table);
$self->SetColumn("id");
- $self->SetRowId($link->GetId);
+ $self->row_id($link->GetId);
my %new = (
linkid=>$link->GetId,
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_ATTR.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -57,7 +57,7 @@
$self->SetArtist(DARTIST_ID);
$self->table($node->{_table});
$self->SetColumn("name");
- $self->SetRowId($node->GetId);
+ $self->row_id($node->GetId);
my $prev = $node->GetName . " (" . $node->GetDescription . ")";
$prev = substr($prev, 0, 251) . " ..." if (length($prev) > 255);
$self->SetPrev($prev);
@@ -99,7 +99,7 @@
$self->{DBH},
);
- my $node = $link->newFromId($self->GetRowId);
+ my $node = $link->newFromId($self->row_id);
if (not $node)
{
$self->InsertNote(MODBOT_MODERATOR, "This link attribute has been deleted");
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_LINK_TYPE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -73,7 +73,7 @@
$self->SetArtist(DARTIST_ID);
$self->table($node->{_table}); # FIXME internal field
$self->SetColumn("name");
- $self->SetRowId($node->GetId);
+ $self->row_id($node->GetId);
$self->SetPrev($node->GetName);
my %new = (
@@ -132,7 +132,7 @@
$self->{'new_unpacked'}{'types'},
);
- my $node = $link->newFromId($self->GetRowId);
+ my $node = $link->newFromId($self->row_id);
if (not $node)
{
$self->InsertNote(MODBOT_MODERATOR, "This link type has been deleted");
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -104,7 +104,7 @@
# if in single edit mod, file moderation under release object.
# If all n releases are stored under artist x use this
# artist as the moderation artist, else VA.
- $self->SetRowId($albums->[0]->GetId) if ($seq == 1);
+ $self->row_id($albums->[0]->GetId) if ($seq == 1);
$self->SetArtist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
@@ -113,7 +113,7 @@
$self->table("album");
$self->SetColumn("id");
- $self->SetRowId($albums->[0]->GetId);
+ $self->row_id($albums->[0]->GetId);
$self->SetNew($self->ConvertHashToNew(\%new));
# This mod is immediately applied, and undone later if rejected.
@@ -189,7 +189,7 @@
my ($self, $adjust) = @_;
# Prior to the ModerationClasses2 branch, the "mod pending" change would
- # only be applied to the releaseid listed in $self->GetRowId - which, in the
+ # only be applied to the releaseid listed in $self->row_id - which, in the
# case of a multiple release change, would be none of them (since the row id
# for them was zero).
# Now though we apply the modpending change to all affected releases.
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -137,7 +137,7 @@
$self->SetPrev($al->GetName);
$self->table("album");
$self->SetColumn("releases");
- $self->SetRowId($al->GetId);
+ $self->row_id($al->GetId);
$self->SetNew($self->ConvertHashToNew(\%new));
}
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -82,7 +82,7 @@
# if in single edit mod, file moderation under release object.
# If all n releases are stored under artist x use this
# artist as the moderation artist, else VA.
- $self->SetRowId($albums->[0]->GetId) if ($seq == 1);
+ $self->row_id($albums->[0]->GetId) if ($seq == 1);
$self->SetArtist(
keys(%artists) > 1
? &ModDefs::VARTIST_ID
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -46,14 +46,14 @@
$self->SetNew($newname);
$self->table("album");
$self->SetColumn("name");
- $self->SetRowId($release->GetId);
+ $self->row_id($release->GetId);
}
sub PostLoad
{
my $self = shift;
- ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->GetRowId, 1);
+ ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->row_id, 1);
}
sub DetermineQuality
@@ -83,7 +83,7 @@
# Load the album by ID
require MusicBrainz::Server::Release;
my $release = MusicBrainz::Server::Release->new($self->{DBH});
- $release->SetId($self->GetRowId);
+ $release->SetId($self->row_id);
unless ($release->LoadFromId)
{
$self->InsertNote(MODBOT_MODERATOR, "This release has been deleted");
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -46,7 +46,7 @@
$self->SetNew($newname);
$self->table("track");
$self->SetColumn("name");
- $self->SetRowId($track->GetId);
+ $self->row_id($track->GetId);
}
sub IsAutoEdit
@@ -64,7 +64,7 @@
# stored in this edit type. (@see Moderation::ShowModType)
# -- the album will be loaded from the album-track core
# relationship if the track was loaded successfully.
- ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->GetRowId, 1);
+ ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->row_id, 1);
($self->{"albumid"}, $self->{"checkexists-album"}) = (undef, 1);
# TODO: what can we do that the release is loaded from this track object?
@@ -107,7 +107,7 @@
# Load the track by ID
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($self->{DBH});
- $track->SetId($self->GetRowId);
+ $track->SetId($self->row_id);
unless ($track->LoadFromId)
{
$self->InsertNote(MODBOT_MODERATOR, "This track has been deleted");
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,7 +45,7 @@
$self->SetNew(0+$newseq);
$self->table("albumjoin");
$self->SetColumn("sequence");
- $self->SetRowId($track->GetSequenceId);
+ $self->row_id($track->GetSequenceId);
}
sub PostLoad
@@ -56,7 +56,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($self->{DBH});
- if ($self->{'trackexists'} = $track->LoadFromAlbumJoin($self->GetRowId))
+ if ($self->{'trackexists'} = $track->LoadFromAlbumJoin($self->row_id))
{
$self->{'trackid'} = $track->GetId;
$self->{'trackname'} = $track->GetName;
@@ -104,7 +104,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($this->{DBH});
- unless ($track->LoadFromAlbumJoin($this->GetRowId))
+ unless ($track->LoadFromAlbumJoin($this->row_id))
{
$this->InsertNote(MODBOT_MODERATOR, "This track has been deleted");
return STATUS_FAILEDPREREQ;
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,7 +45,7 @@
$self->SetNew(0+$newlength);
$self->table("track");
$self->SetColumn("length");
- $self->SetRowId($track->GetId);
+ $self->row_id($track->GetId);
}
sub PostLoad
@@ -56,7 +56,7 @@
# stored in this edit type. (@see Moderation::ShowModType)
# -- the album will be loaded from the album-track core
# relationship if the track was loaded successfully.
- ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->GetRowId, 1);
+ ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->row_id, 1);
($self->{"albumid"}, $self->{"checkexists-album"}) = (undef, 1);
# TODO: what can we do that the release is loaded from this track object?
@@ -110,7 +110,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($self->{DBH});
- $track->SetId($self->GetRowId);
+ $track->SetId($self->row_id);
unless ($track->LoadFromId)
{
$self->InsertNote(MODBOT_MODERATOR, "This track has been deleted");
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -90,13 +90,13 @@
$self->SetNew($self->ConvertHashToNew(\%new));
$self->table("url");
$self->SetColumn("url");
- $self->SetRowId($urlobj->GetId);
+ $self->row_id($urlobj->GetId);
}
sub PostLoad
{
my $self = shift;
- $self->{'_urlobj'} = MusicBrainz::Server::URL->newFromId($self->{DBH}, $self->GetRowId);
+ $self->{'_urlobj'} = MusicBrainz::Server::URL->newFromId($self->{DBH}, $self->row_id);
$self->{'new_unpacked'} = $self->ConvertNewToHash($self->GetNew()) or die;
$self->{'prev_unpacked'} = $self->ConvertNewToHash($self->GetPrev()) or die;
}
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -54,7 +54,7 @@
$self->table("album");
$self->SetColumn("artist");
$self->SetArtist($al->GetArtist);
- $self->SetRowId($al->GetId);
+ $self->row_id($al->GetId);
$self->SetNew($new);
}
@@ -75,7 +75,7 @@
# attempt to load the release entitiy from the value
# stored in this edit type. (@see Moderation::ShowModType)
- ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->GetRowId, 1);
+ ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->row_id, 1);
}
sub DetermineQuality
@@ -116,7 +116,7 @@
# load album name
require MusicBrainz::Server::Release;
my $al = MusicBrainz::Server::Release->new($this->{DBH});
- $al->SetId($this->GetRowId);
+ $al->SetId($this->row_id);
if ($al->LoadFromId)
{
$this->{'albumname'} = $al->GetName;
@@ -146,7 +146,7 @@
{
my $self = shift;
- my $rowid = $self->GetRowId;
+ my $rowid = $self->row_id;
# Load the album by ID
require MusicBrainz::Server::Release;
@@ -216,7 +216,7 @@
if ($movetracks)
{
if ($sql->Select("SELECT track FROM albumjoin WHERE album = ?",
- $this->GetRowId))
+ $this->row_id))
{
while (my @row = $sql->NextRow)
{
@@ -235,7 +235,7 @@
$sql->Do(
"UPDATE album SET artist = ? WHERE id = ?",
$newid,
- $this->GetRowId,
+ $this->row_id,
) or die "Failed to update artist in MOD_MAC_TO_SAC";
STATUS_APPLIED;
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -57,7 +57,7 @@
$self->table("artist");
$self->SetColumn("name");
$self->SetArtist($source->GetId);
- $self->SetRowId($source->GetId);
+ $self->row_id($source->GetId);
$self->SetPrev($source->GetName);
$self->SetNew($self->ConvertHashToNew(\%new));
}
@@ -117,7 +117,7 @@
require MusicBrainz::Server::Artist;
my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
- for my $artistid ($self->GetRowId, $self->{"new.id"})
+ for my $artistid ($self->row_id, $self->{"new.id"})
{
defined($artistid) or next;
$ar->SetId($artistid);
@@ -131,7 +131,7 @@
my $self = shift;
my $prevval = $self->GetPrev;
- my $rowid = $self->GetRowId;
+ my $rowid = $self->row_id;
my $name = $self->{'new.name'};
#my $sortname = $self->{'new.sortname'};
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -55,7 +55,7 @@
$self->table("label");
$self->SetColumn("name");
- $self->SetRowId($source->GetId);
+ $self->row_id($source->GetId);
$self->SetPrev($source->GetName);
$self->SetNew($self->ConvertHashToNew(\%new));
}
@@ -92,7 +92,7 @@
require MusicBrainz::Server::Label;
my $ar = MusicBrainz::Server::Label->new($self->{DBH});
- for my $labelid ($self->GetRowId, $self->{"new.id"})
+ for my $labelid ($self->row_id, $self->{"new.id"})
{
defined($labelid) or next;
$ar->SetId($labelid);
@@ -106,7 +106,7 @@
my $self = shift;
my $prevval = $self->GetPrev;
- my $rowid = $self->GetRowId;
+ my $rowid = $self->row_id;
my $name = $self->{'new.name'};
#my $sortname = $self->{'new.sortname'};
@@ -194,7 +194,7 @@
{
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
- my $id = $self->GetRowId;
+ my $id = $self->row_id;
require MusicBrainz::Server::Label;
my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -68,7 +68,7 @@
$self->SetArtist($into->GetArtist);
$self->table("album");
$self->SetColumn("id");
- $self->SetRowId($into->GetId);
+ $self->row_id($into->GetId);
$self->SetNew($self->ConvertHashToNew(\%new));
}
@@ -150,7 +150,7 @@
my $al = MusicBrainz::Server::Release->new($self->{DBH});
# Prior to the ModerationClasses2 branch, the "mod pending" change would
- # only be applied to the album listed in $self->GetRowId, i.e. the target
+ # only be applied to the album listed in $self->row_id, i.e. the target
# of the merge (here referred to as the "into" album).
# Now though we apply the modpending change to all affected albums.
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -98,7 +98,7 @@
$self->table("album_cdtoc");
$self->SetColumn("album");
- $self->SetRowId($alcdtoc->GetId);
+ $self->row_id($alcdtoc->GetId);
$self->SetArtist($oldal->GetArtist);
$self->SetPrev($oldal->GetId);
@@ -150,7 +150,7 @@
$sql->Do(
"UPDATE album_cdtoc SET modpending = modpending + ? WHERE id = ?",
$adjust,
- $self->GetRowId,
+ $self->row_id,
);
}
@@ -166,7 +166,7 @@
# Check that the album_cdtoc row still exists
require MusicBrainz::Server::ReleaseCDTOC;
- my $album_cdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId)
+ my $album_cdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->row_id)
or do {
$self->InsertNote(MODBOT_MODERATOR, "This disc ID has been deleted");
$self->SetStatus(STATUS_FAILEDDEP);
@@ -202,7 +202,7 @@
MusicBrainz::Server::ReleaseCDTOC->Insert($self->{DBH}, $self->GetPrev, $new->{"FullTOC"});
} else {
# Move the row back to the old album
- my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId)
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->row_id)
or return;
$alcdtoc->MoveToRelease($self->GetPrev);
}
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -54,7 +54,7 @@
$self->table("album");
$self->SetColumn("artist");
$self->SetArtist($release->GetArtist);
- $self->SetRowId($release->GetId);
+ $self->row_id($release->GetId);
$self->SetPrev($artist->GetName);
$self->SetNew($new);
}
@@ -75,7 +75,7 @@
}
# verify if release still exists in Moderation.ShowModType method.
- ($this->{"albumid"}, $this->{"checkexists-album"}) = ($this->GetRowId, 1);
+ ($this->{"albumid"}, $this->{"checkexists-album"}) = ($this->row_id, 1);
}
sub DetermineQuality
@@ -123,7 +123,7 @@
# load album name
require MusicBrainz::Server::Release;
my $release = MusicBrainz::Server::Release->new($this->{DBH});
- $release->SetId($this->GetRowId);
+ $release->SetId($this->row_id);
if ($release->LoadFromId)
{
$this->{'albumname'} = $release->GetName;
@@ -204,7 +204,7 @@
# Check album is still where it used to be
$sql->SelectSingleValue(
"SELECT 1 FROM album WHERE id = ? AND artist = ?",
- $this->GetRowId,
+ $this->row_id,
$this->GetArtist,
) or do {
$this->InsertNote(MODBOT_MODERATOR, "This release has already been deleted or moved");
@@ -247,7 +247,7 @@
if ($this->{'new.movetracks'})
{
if ($sql->Select("SELECT track FROM albumjoin WHERE album = ?",
- $this->GetRowId))
+ $this->row_id))
{
while (my @row = $sql->NextRow)
{
@@ -266,7 +266,7 @@
$sql->Do(
"UPDATE album SET artist = ? WHERE id = ?",
$newid,
- $this->GetRowId,
+ $this->row_id,
);
STATUS_APPLIED;
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -45,7 +45,7 @@
$self->SetPrev($ar->GetName);
$self->table("artist");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
sub DetermineQuality
@@ -65,7 +65,7 @@
{
my $this = shift;
- my $rowid = $this->GetRowId;
+ my $rowid = $this->row_id;
if ($rowid == VARTIST_ID or $rowid == DARTIST_ID)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -44,7 +44,7 @@
$self->SetPrev($alias->GetName);
$self->table("artistalias");
$self->SetColumn("name");
- $self->SetRowId($alias->GetId);
+ $self->row_id($alias->GetId);
}
sub DetermineQuality
@@ -67,7 +67,7 @@
require MusicBrainz::Server::Alias;
my $al = MusicBrainz::Server::Alias->new($this->{DBH});
$al->table("ArtistAlias");
- $al->SetId($this->GetRowId);
+ $al->SetId($this->row_id);
unless ($al->LoadFromId)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -73,7 +73,7 @@
$self->table("album_cdtoc");
$self->SetColumn("album");
- $self->SetRowId($alcdtoc->GetId);
+ $self->row_id($alcdtoc->GetId);
$self->SetArtist($oldrelease->GetArtist);
$self->SetPrev($cdtoc->GetDiscID);
@@ -125,7 +125,7 @@
$sql->Do(
"UPDATE album_cdtoc SET modpending = modpending + ? WHERE id = ?",
$adjust,
- $self->GetRowId,
+ $self->row_id,
);
}
@@ -135,7 +135,7 @@
require MusicBrainz::Server::ReleaseCDTOC;
- my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->GetRowId);
+ my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->newFromId($self->{DBH}, $self->row_id);
if (not $alcdtoc)
{
$self->InsertNote(MODBOT_MODERATOR, "This disc ID has already been removed");
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -43,14 +43,14 @@
$self->SetPrev($ar->GetName);
$self->table("label");
$self->SetColumn("name");
- $self->SetRowId($ar->GetId);
+ $self->row_id($ar->GetId);
}
sub ApprovedAction
{
my $this = shift;
- my $rowid = $this->GetRowId;
+ my $rowid = $this->row_id;
if ($rowid == %ModDefs::DLABEL_ID)
{
@@ -87,7 +87,7 @@
{
my ($self, $m) = @_;
$m->out('<tr class="entity"><td class="lbl">Label:</td><td>');
- my $id = $self->GetRowId;
+ my $id = $self->row_id;
require MusicBrainz::Server::Label;
my $label = MusicBrainz::Server::Label->new($self->{DBH});
$label->SetId($id);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm 2008-09-01 23:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -43,7 +43,7 @@
$self->SetPrev($alias->GetName);
$self->table("labelalias");
$self->SetColumn("name");
- $self->SetRowId($alias->GetId);
+ $self->row_id($alias->GetId);
}
sub ApprovedAction
@@ -53,7 +53,7 @@
require MusicBrainz::Server::Alias;
my $al = MusicBrainz::Server::Alias->new($this->{DBH});
$al->table("labelalias");
- $al->SetId($this->GetRowId);
+ $al->SetId($this->row_id);
unless ($al->LoadFromId)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -54,7 +54,7 @@
}
$self->table($link->Table);
$self->SetColumn("id");
- $self->SetRowId($link->GetId);
+ $self->row_id($link->GetId);
require MusicBrainz::Server::LinkType;
my $linktype = MusicBrainz::Server::LinkType->newFromPackedTypes($self->{DBH}, $types->[0].'-'.$types->[1]);
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_ATTR.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -49,7 +49,7 @@
$self->SetArtist(DARTIST_ID);
$self->table($node->{_table});
$self->SetColumn("name");
- $self->SetRowId($node->GetId);
+ $self->row_id($node->GetId);
$self->SetPrev($node->GetName . " (" . $node->GetDescription . ")");
my %new = (
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK_TYPE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -57,7 +57,7 @@
$self->SetArtist(DARTIST_ID);
$self->table($node->{_table}); # FIXME internal field
$self->SetColumn("name");
- $self->SetRowId($node->GetId);
+ $self->row_id($node->GetId);
$self->SetPrev($node->GetName);
my %new = (
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -43,7 +43,7 @@
$self->table("puidjoin");
$self->SetColumn("id");
- $self->SetRowId($puidjoinid);
+ $self->row_id($puidjoinid);
$self->SetArtist($track->GetArtist);
$self->SetPrev($puid);
@@ -63,7 +63,7 @@
# then undo the mod later if it's rejected.
require MusicBrainz::Server::PUID;
my $t = MusicBrainz::Server::PUID->new($self->{DBH});
- $t->RemovePUIDByPUIDJoin($self->GetRowId);
+ $t->RemovePUIDByPUIDJoin($self->row_id);
}
sub PostLoad
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -43,14 +43,14 @@
$self->SetPrev($al->GetName);
$self->table("album");
$self->SetColumn("name");
- $self->SetRowId($al->GetId);
+ $self->row_id($al->GetId);
}
sub PostLoad
{
my $self = shift;
- ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->GetRowId, 1);
+ ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->row_id, 1);
}
sub DetermineQuality
@@ -72,7 +72,7 @@
require MusicBrainz::Server::Release;
my $al = MusicBrainz::Server::Release->new($this->{DBH});
- $al->SetId($this->GetRowId);
+ $al->SetId($this->row_id);
unless ($al->Remove)
{
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -65,7 +65,7 @@
);
$self->table("album");
$self->SetColumn("id");
- $self->SetRowId($albums->[0]->GetId); # misleading
+ $self->row_id($albums->[0]->GetId); # misleading
$self->SetNew($self->ConvertHashToNew(\%new));
}
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -44,7 +44,7 @@
$self->SetPrev($tr->GetName . "\n" . $al->GetId . "\n" . $al->IsNonAlbumTracks . "\n" . $tr->GetSequence . "\n" . $tr->GetLength);
$self->table("track");
$self->SetColumn("name");
- $self->SetRowId($tr->GetId);
+ $self->row_id($tr->GetId);
}
sub PostLoad
@@ -59,7 +59,7 @@
# attempt to load the release/track entities from the values
# stored in this edit type. (@see Moderation::ShowModType method)
- ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->GetRowId, 1);
+ ($self->{"trackid"}, $self->{"checkexists-track"}) = ($self->row_id, 1);
($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->{'prev.albumid'}, 1);
# store value for the trackname, in case the track can't be loaded from
@@ -86,7 +86,7 @@
require MusicBrainz::Server::Track;
my $track = MusicBrainz::Server::Track->new($this->{DBH});
- $track->SetId($this->GetRowId);
+ $track->SetId($this->row_id);
$track->SetRelease($this->{'prev.albumid'});
# Remove the album join for this track
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -43,7 +43,7 @@
$self->table("trmjoin");
$self->SetColumn("id");
- $self->SetRowId($trmjoinid);
+ $self->row_id($trmjoinid);
$self->SetArtist($track->GetArtist);
$self->SetPrev($trm);
@@ -63,7 +63,7 @@
# then undo the mod later if it's rejected.
require MusicBrainz::Server::TRM;
my $t = MusicBrainz::Server::TRM->new($self->{DBH});
- $t->RemoveTRMByTRMJoin($self->GetRowId);
+ $t->RemoveTRMByTRMJoin($self->row_id);
}
sub PostLoad
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -50,7 +50,7 @@
$self->table("album");
$self->SetColumn("artist");
$self->SetArtist($al->GetArtist);
- $self->SetRowId($al->GetId);
+ $self->row_id($al->GetId);
$self->SetPrev($ar->GetName);
$self->SetNew($movetova);
}
@@ -61,7 +61,7 @@
# attempt to load the release entitiy from the value
# stored in this edit type. (@see Moderation::ShowModType)
- ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->GetRowId, 1);
+ ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->row_id, 1);
}
sub DetermineQuality
@@ -94,7 +94,7 @@
# Load the album by ID
require MusicBrainz::Server::Release;
my $release = MusicBrainz::Server::Release->new($self->{DBH});
- $release->SetId($self->GetRowId);
+ $release->SetId($self->row_id);
unless ($release->LoadFromId)
{
$self->InsertNote(MODBOT_MODERATOR, "This release has been deleted");
@@ -135,7 +135,7 @@
$sql->Do(
"UPDATE album SET artist = ? WHERE id = ? AND artist = ?",
&ModDefs::VARTIST_ID,
- $self->GetRowId,
+ $self->row_id,
$self->GetArtist,
) or die "Failed to update album in MOD_SAC_TO_MAC";
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:32:40 UTC (rev 10273)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-09-01 23:35:47 UTC (rev 10274)
@@ -81,7 +81,7 @@
$self->SetArtist($release->GetArtist);
$self->table("album");
$self->SetColumn("cdtoc.text");
- $self->SetRowId($release->GetId);
+ $self->row_id($release->GetId);
}
sub PostLoad
@@ -90,7 +90,7 @@
$self->{'new_unpacked'} = $self->ConvertNewToHash($self->GetNew)
or die;
- ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->GetRowId, 1);
+ ($self->{"albumid"}, $self->{"checkexists-album"}) = ($self->row_id, 1);
}
sub DetermineQuality
@@ -113,7 +113,7 @@
# Load the album by ID
require MusicBrainz::Server::Release;
my $release = MusicBrainz::Server::Release->new($self->{DBH});
- $release->SetId($self->GetRowId);
+ $release->SetId($self->row_id);
unless ($release->LoadFromId)
{
$self->InsertNote(MODBOT_MODERATOR, "This release has been deleted");
More information about the MusicBrainz-commits
mailing list