[mb-commits] r9749 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/moderation
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 16:13:03 UTC 2008
Author: luks
Date: 2008-03-10 16:13:03 +0000 (Mon, 10 Mar 2008)
New Revision: 9749
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASE
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM
Modified:
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/ModDefs.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
Log:
s/MOD_ADD_ALBUM/MOD_ADD_RELEASE/
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-10 16:09:48 UTC (rev 9748)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-10 16:13:03 UTC (rev 9749)
@@ -27,7 +27,7 @@
package Insert;
-use ModDefs qw( VARTIST_ID DARTIST_ID ANON_MODERATOR MODBOT_MODERATOR MOD_ADD_ALBUM );
+use ModDefs qw( VARTIST_ID DARTIST_ID ANON_MODERATOR MODBOT_MODERATOR MOD_ADD_RELEASE );
sub new
{
@@ -86,7 +86,7 @@
# }
# ] (always exactly one track)
#
-# MOD_ADD_ALBUM PreInsert
+# MOD_ADD_RELEASE PreInsert
# EITHER artist+sortname OR artistid
# album => name
# OPTIONAL cdindexid => ..., toc => ...
@@ -629,7 +629,7 @@
}
# Called by FreeDB->InsertForModeration and cdi/done.html
-# This inserts a mod of type MOD_ADD_ALBUM, which in turn calls
+# This inserts a mod of type MOD_ADD_RELEASE, which in turn calls
# $insert->Insert (above).
sub InsertAlbumModeration
@@ -640,7 +640,7 @@
# TODO: for now, the $new passed in is still the packed string
# (key=value\nkey=value\n etc). Here we parse that back into hash form
- # and pass it into the MOD_ADD_ALBUM handler. Eventually we'll invent a
+ # and pass it into the MOD_ADD_RELEASE handler. Eventually we'll invent a
# new named-arguments convention and pass a hash like that, instead of
# passing packed strings.
my %opts = (
@@ -655,13 +655,13 @@
DBH => $this->{DBH},
uid => $moderator || ANON_MODERATOR,
privs => $privs || 0,
- type => MOD_ADD_ALBUM,
+ type => MOD_ADD_RELEASE,
#
%opts,
artist => $artist,
);
- (my $mod) = grep { $_->Type == MOD_ADD_ALBUM } @mods
+ (my $mod) = grep { $_->Type == MOD_ADD_RELEASE } @mods
or die;
$mod->InsertNote(
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:09:48 UTC (rev 9748)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:13:03 UTC (rev 9749)
@@ -88,7 +88,7 @@
use constant MOD_MAC_TO_SAC => 13;
use constant MOD_REMOVE_ARTISTALIAS => 14;
use constant MOD_ADD_ARTISTALIAS => 15;
-use constant MOD_ADD_ALBUM => 16;
+use constant MOD_ADD_RELEASE => 16;
use constant MOD_ADD_ARTIST => 17;
use constant MOD_ADD_TRACK_KV => 18;
use constant MOD_REMOVE_ARTIST => 19;
@@ -270,7 +270,7 @@
# DataQuality level moderations catogorization
my %ModCategories = (
- MOD_ADD_ALBUM . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
+ MOD_ADD_RELEASE . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
MOD_ADD_RELEASE_ANNOTATION . "" => {'category' => CAT_NONE, 'criteria' => ""},
MOD_ADD_ARTIST . "" => {'category' => CAT_NONE, 'criteria' => ""},
MOD_ADD_ARTISTALIAS . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:09:48 UTC (rev 9748)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:13:03 UTC (rev 9749)
@@ -35,7 +35,7 @@
use utf8;
# Load all the moderation handlers (sorted please)
-require MusicBrainz::Server::Moderation::MOD_ADD_ALBUM;
+require MusicBrainz::Server::Moderation::MOD_ADD_RELEASE;
require MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION;
require MusicBrainz::Server::Moderation::MOD_ADD_ARTIST;
require MusicBrainz::Server::Moderation::MOD_ADD_ARTISTALIAS;
@@ -134,8 +134,8 @@
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ARTISTALIAS::Name() },
MOD_ADD_ARTISTALIAS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTISTALIAS::Name() },
- MOD_ADD_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM::Name() },
+ MOD_ADD_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE::Name() },
MOD_ADD_ARTIST ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST::Name() },
MOD_ADD_TRACK_KV ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -258,8 +258,8 @@
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ARTISTALIAS::Name() },
MOD_ADD_ARTISTALIAS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTISTALIAS::Name() },
- MOD_ADD_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM::Name() },
+ MOD_ADD_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE::Name() },
MOD_ADD_ARTIST ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST::Name() },
MOD_ADD_TRACK_KV ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -382,8 +382,8 @@
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ARTISTALIAS::Name() },
MOD_ADD_ARTISTALIAS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTISTALIAS::Name() },
- MOD_ADD_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM::Name() },
+ MOD_ADD_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE::Name() },
MOD_ADD_ARTIST ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST::Name() },
MOD_ADD_TRACK_KV ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-10 16:09:48 UTC (rev 9748)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-10 16:13:03 UTC (rev 9749)
@@ -101,7 +101,7 @@
my $sql = Sql->new($self->{DBH});
(my $albummodid) = $sql->SelectSingleValue(
"SELECT id FROM moderation_open WHERE type = "
- . &ModDefs::MOD_ADD_ALBUM
+ . &ModDefs::MOD_ADD_RELEASE
. " AND rowid = ?", $self->GetRowId,
);
$new{'Dep0'} = $albummodid if ($albummodid);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-10 16:09:48 UTC (rev 9748)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-10 16:13:03 UTC (rev 9749)
@@ -1311,7 +1311,7 @@
. "WHERE tab = 'album' AND rowid = ? AND type = ? ",
$this->GetLanguageId || undef,
$this->GetId,
- &ModDefs::MOD_ADD_ALBUM,
+ &ModDefs::MOD_ADD_RELEASE,
);
}
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASE (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM)
More information about the MusicBrainz-commits
mailing list