[mb-commits] r9763 - in mb_server/trunk: admin admin/ar admin/cleanup admin/reports admin/sql/updates cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs htdocs/bare htdocs/cdi htdocs/comp htdocs/comp/browse htdocs/comp/form htdocs/comp/layout htdocs/comp/moderation htdocs/comp/release htdocs/comp/release_editor htdocs/edit/album htdocs/edit/albumbatch htdocs/edit/albumlanguage htdocs/edit/albumquality htdocs/edit/albumreleases htdocs/edit/annotation htdocs/edit/annotation/album htdocs/edit/artist htdocs/edit/discid htdocs/edit/label htdocs/edit/track htdocs/freedb htdocs/mod/search htdocs/mod/search/pre htdocs/reports htdocs/search htdocs/show/artist htdocs/show/cdtoc htdocs/show/edit htdocs/show/label htdocs/show/puid htdocs/show/release htdocs/show/track htdocs/show/trm htdocs/user
root at musicbrainz.org
root at musicbrainz.org
Tue Mar 11 11:32:24 UTC 2008
Author: luks
Date: 2008-03-11 11:32:23 +0000 (Tue, 11 Mar 2008)
New Revision: 9763
Added:
mb_server/trunk/cgi-bin/MusicBrainz/Server/Alias.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Artist.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Label.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_EVENTS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE_MAC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE_EVENTS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/TRM.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Track.pm
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_RELEASE
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_RELEASE_ANNOTATION
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_RELEASE_EVENTS
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASE_ATTRS
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASE_EVENTS
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASE_EVENTS_OLD
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASE_LANGUAGE
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASE_NAME
mb_server/trunk/htdocs/comp/moderation/MOD_MERGE_RELEASE
mb_server/trunk/htdocs/comp/moderation/MOD_MERGE_RELEASE_MAC
mb_server/trunk/htdocs/comp/moderation/MOD_MOVE_RELEASE
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_RELEASE
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_RELEASES
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_RELEASE_EVENTS
Removed:
mb_server/trunk/cgi-bin/Album.pm
mb_server/trunk/cgi-bin/Alias.pm
mb_server/trunk/cgi-bin/Artist.pm
mb_server/trunk/cgi-bin/Label.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM_ANNOTATION.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASEEVENTS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASEEVENTS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM_MAC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASEEVENTS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/trunk/cgi-bin/PUID.pm
mb_server/trunk/cgi-bin/TRM.pm
mb_server/trunk/cgi-bin/Track.pm
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_ALBUM
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_ALBUM_ANNOTATION
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_ALBUMNAME
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_RELEASES
mb_server/trunk/htdocs/comp/moderation/MOD_MERGE_ALBUM
mb_server/trunk/htdocs/comp/moderation/MOD_MERGE_ALBUM_MAC
mb_server/trunk/htdocs/comp/moderation/MOD_MOVE_ALBUM
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_ALBUM
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_ALBUMS
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS
Modified:
mb_server/trunk/admin/RDFDump.pl
mb_server/trunk/admin/ar/ImportLinks
mb_server/trunk/admin/cleanup/EmptyArtists.pl
mb_server/trunk/admin/cleanup/FixFeaturingArtists
mb_server/trunk/admin/cleanup/FixLength.pl
mb_server/trunk/admin/cleanup/RemoveAnnotations
mb_server/trunk/admin/cleanup/SanityCheck.pl
mb_server/trunk/admin/cleanup/SmartQuotes
mb_server/trunk/admin/cleanup/UnusedTracks
mb_server/trunk/admin/cleanup/UpdateCoverArt.pl
mb_server/trunk/admin/reports/AlbumsToConvert.inc
mb_server/trunk/admin/reports/AlbumsToConvert.pl
mb_server/trunk/admin/reports/DuplicateAlbums
mb_server/trunk/admin/reports/DuplicateArtists.inc
mb_server/trunk/admin/reports/DuplicateArtists2
mb_server/trunk/admin/reports/DuplicateTrackNumbers
mb_server/trunk/admin/reports/PUIDsWithManyTracks.inc
mb_server/trunk/admin/reports/SuperfluousDataTracks
mb_server/trunk/admin/reports/TRMsWithManyTracks.inc
mb_server/trunk/admin/reports/TracksNamedWithSequence.pl
mb_server/trunk/admin/sql/updates/20040326-1.pl
mb_server/trunk/admin/sql/updates/20060305-2.pl
mb_server/trunk/admin/startup.pl.default
mb_server/trunk/cgi-bin/FreeDB.pm
mb_server/trunk/cgi-bin/Insert.pm
mb_server/trunk/cgi-bin/MM.pm
mb_server/trunk/cgi-bin/MM_2_0.pm
mb_server/trunk/cgi-bin/MM_2_1.pm
mb_server/trunk/cgi-bin/ModDefs.pm
mb_server/trunk/cgi-bin/Moderation.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Annotation.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Attribute.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/CDTOC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/User.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Link.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/LinkEntity.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTIST.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_DISCID.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABEL_ANNOTATION.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LINK.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_PUIDS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRMS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_RELEASE_QUALITY.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTIST.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTNAME.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTSORTNAME.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABEL.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LINK.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ARTIST.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_LABEL.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_DISCID.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTIST.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_DISCID.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABEL.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LINK.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_SAC_TO_MAC.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
mb_server/trunk/cgi-bin/MusicBrainz/Server/Tag.pm
mb_server/trunk/cgi-bin/QuerySupport.pm
mb_server/trunk/cgi-bin/SearchEngine.pm
mb_server/trunk/cgi-bin/TableBase.pm
mb_server/trunk/cgi-bin/TaggerSupport.pm
mb_server/trunk/htdocs/bare/cdlookup.html
mb_server/trunk/htdocs/bare/xget.html
mb_server/trunk/htdocs/browseartists.html
mb_server/trunk/htdocs/browselabels.html
mb_server/trunk/htdocs/browsevarious.html
mb_server/trunk/htdocs/cdi/enter.html
mb_server/trunk/htdocs/cdi/searchartistrelease.html
mb_server/trunk/htdocs/comp/artisttitle
mb_server/trunk/htdocs/comp/browse/filtersbox
mb_server/trunk/htdocs/comp/cdtocinfo
mb_server/trunk/htdocs/comp/form/currentvalue
mb_server/trunk/htdocs/comp/labeltitle
mb_server/trunk/htdocs/comp/layout/editformbegin
mb_server/trunk/htdocs/comp/loadartist
mb_server/trunk/htdocs/comp/loadartistalias
mb_server/trunk/htdocs/comp/loadlabel
mb_server/trunk/htdocs/comp/loadlabelalias
mb_server/trunk/htdocs/comp/loadrelease
mb_server/trunk/htdocs/comp/loadtrack
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_ARTIST
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_LABEL
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_TRACK
mb_server/trunk/htdocs/comp/moderation/MOD_ADD_TRACK_KV
mb_server/trunk/htdocs/comp/moderation/MOD_CHANGE_ARTIST_QUALITY
mb_server/trunk/htdocs/comp/moderation/MOD_CHANGE_RELEASE_QUALITY
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_ARTIST
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_LABEL
mb_server/trunk/htdocs/comp/moderation/MOD_EDIT_TRACKTIME
mb_server/trunk/htdocs/comp/moderation/MOD_MAC_TO_SAC
mb_server/trunk/htdocs/comp/moderation/MOD_MERGE_ARTIST
mb_server/trunk/htdocs/comp/moderation/MOD_MERGE_LABEL
mb_server/trunk/htdocs/comp/moderation/MOD_MOVE_DISCID
mb_server/trunk/htdocs/comp/moderation/MOD_REMOVE_TRACK
mb_server/trunk/htdocs/comp/moderation/MOD_SAC_TO_MAC
mb_server/trunk/htdocs/comp/moderation/MOD_SET_RELEASE_DURATIONS
mb_server/trunk/htdocs/comp/release/release_begin
mb_server/trunk/htdocs/comp/release/release_end
mb_server/trunk/htdocs/comp/release/release_track
mb_server/trunk/htdocs/comp/release_editor/check-artists
mb_server/trunk/htdocs/comp/release_editor/check-attributes
mb_server/trunk/htdocs/comp/release_editor/check-fields
mb_server/trunk/htdocs/comp/release_editor/check-labels
mb_server/trunk/htdocs/comp/release_editor/convert-moverelease
mb_server/trunk/htdocs/comp/release_editor/convert-tosac
mb_server/trunk/htdocs/comp/release_editor/entermoderations-add
mb_server/trunk/htdocs/comp/release_editor/entermoderations-edit
mb_server/trunk/htdocs/comp/release_editor/form-attributes
mb_server/trunk/htdocs/comp/release_editor/form-releases
mb_server/trunk/htdocs/comp/release_editor/init-addrelease
mb_server/trunk/htdocs/comp/release_editor/init-editall
mb_server/trunk/htdocs/comp/release_editor/review
mb_server/trunk/htdocs/comp/trackinfo
mb_server/trunk/htdocs/edit/album/add.html
mb_server/trunk/htdocs/edit/album/attrform
mb_server/trunk/htdocs/edit/album/edit.html
mb_server/trunk/htdocs/edit/album/editattributes.html
mb_server/trunk/htdocs/edit/album/move.html
mb_server/trunk/htdocs/edit/album/remove.html
mb_server/trunk/htdocs/edit/albumbatch/done.html
mb_server/trunk/htdocs/edit/albumbatch/merge.html
mb_server/trunk/htdocs/edit/albumbatch/remove.html
mb_server/trunk/htdocs/edit/albumlanguage/edit.html
mb_server/trunk/htdocs/edit/albumquality/edit.html
mb_server/trunk/htdocs/edit/albumreleases/editreleases.html
mb_server/trunk/htdocs/edit/albumreleases/enter.html
mb_server/trunk/htdocs/edit/albumreleases/index.html
mb_server/trunk/htdocs/edit/albumreleases/review.html
mb_server/trunk/htdocs/edit/annotation/album/edit.html
mb_server/trunk/htdocs/edit/annotation/album/history.html
mb_server/trunk/htdocs/edit/annotation/backreference
mb_server/trunk/htdocs/edit/annotation/edit-link
mb_server/trunk/htdocs/edit/annotation/latest
mb_server/trunk/htdocs/edit/annotation/show
mb_server/trunk/htdocs/edit/artist/add.html
mb_server/trunk/htdocs/edit/artist/edit.html
mb_server/trunk/htdocs/edit/artist/main-form
mb_server/trunk/htdocs/edit/artist/strict.html
mb_server/trunk/htdocs/edit/discid/move.html
mb_server/trunk/htdocs/edit/discid/remove.html
mb_server/trunk/htdocs/edit/label/add.html
mb_server/trunk/htdocs/edit/label/edit.html
mb_server/trunk/htdocs/edit/label/main-form
mb_server/trunk/htdocs/edit/track/add.html
mb_server/trunk/htdocs/edit/track/addnonalbum.html
mb_server/trunk/htdocs/edit/track/edit.html
mb_server/trunk/htdocs/freedb/review.html
mb_server/trunk/htdocs/mod/search/pre/annotations.html
mb_server/trunk/htdocs/mod/search/setquery.inc
mb_server/trunk/htdocs/reports/show_album_duplicates.inc
mb_server/trunk/htdocs/reports/show_artist_duplicates.inc
mb_server/trunk/htdocs/reports/show_full_albums.inc
mb_server/trunk/htdocs/search/oldsearch.html
mb_server/trunk/htdocs/show/artist/aliases.html
mb_server/trunk/htdocs/show/artist/index.html
mb_server/trunk/htdocs/show/artist/subscriptions.html
mb_server/trunk/htdocs/show/cdtoc/index.html
mb_server/trunk/htdocs/show/edit/conditions.html
mb_server/trunk/htdocs/show/label/aliases.html
mb_server/trunk/htdocs/show/label/index.html
mb_server/trunk/htdocs/show/label/subscriptions.html
mb_server/trunk/htdocs/show/puid/index.html
mb_server/trunk/htdocs/show/release/details.html
mb_server/trunk/htdocs/show/track/index.html
mb_server/trunk/htdocs/show/track/relationships.html
mb_server/trunk/htdocs/show/trm/index.html
mb_server/trunk/htdocs/taglookup.html
mb_server/trunk/htdocs/user/subscribe.html
Log:
Merge log:mb_server/branches/terminology at 9727:9758
Modified: mb_server/trunk/admin/RDFDump.pl
===================================================================
--- mb_server/trunk/admin/RDFDump.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/RDFDump.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -31,9 +31,9 @@
use Sql;
use MusicBrainz;
use MM_2_1;
-use Artist;
-use Album;
-use Track;
+use MusicBrainz::Server::Artist;
+use MusicBrainz::Server::Release;
+use MusicBrainz::Server::Track;
my $verbose = -t;
@@ -172,7 +172,7 @@
$start = time;
$mx = $sql->Rows();
- $album = Album->new($sql->{DBH});
+ $album = MusicBrainz::Server::Release->new($sql->{DBH});
$sql2 = Sql->new($sql->{DBH});
$sql2->Select(
"SELECT j.album, t.discid
@@ -230,15 +230,15 @@
shift @attrs;
foreach $attr (@attrs)
{
- if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $rdf->Element("rdf:type", "", "rdf:resource",
$rdf->GetMMNamespace() . "Type" .
$album->GetAttributeName($attr));
}
- elsif ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $rdf->Element("mm:release", "", "rdf:resource",
$rdf->GetMMNamespace() . "Status" .
Modified: mb_server/trunk/admin/ar/ImportLinks
===================================================================
--- mb_server/trunk/admin/ar/ImportLinks 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/ar/ImportLinks 2008-03-11 11:32:23 UTC (rev 9763)
@@ -31,7 +31,7 @@
use Sql;
use Data::Dumper;
use MusicBrainz;
-use Artist;
+use MusicBrainz::Server::Artist;
my $mb = MusicBrainz->new;
$mb->Login;
@@ -51,8 +51,8 @@
$rel =~ s/^\s*|\s*$//g;
#print "$ent0 $ent1 $rel\n";
- my $ar0 = Artist->new($mb->{DBH});
- my $ar1 = Artist->new($mb->{DBH});
+ my $ar0 = MusicBrainz::Server::Artist->new($mb->{DBH});
+ my $ar1 = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar0->SetMBId($ent0);
$ar1->SetMBId($ent1);
Modified: mb_server/trunk/admin/cleanup/EmptyArtists.pl
===================================================================
--- mb_server/trunk/admin/cleanup/EmptyArtists.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/EmptyArtists.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -230,8 +230,8 @@
eval
{
- use Artist;
- my $ar = Artist->new($sqlWrite->{DBH});
+ use MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{DBH});
# No need to load the whole record, hopefully...
$ar->SetId($id);
Modified: mb_server/trunk/admin/cleanup/FixFeaturingArtists
===================================================================
--- mb_server/trunk/admin/cleanup/FixFeaturingArtists 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/FixFeaturingArtists 2008-03-11 11:32:23 UTC (rev 9763)
@@ -39,7 +39,7 @@
use ModDefs;
use UserStuff;
use Moderation;
-use Track;
+use MusicBrainz::Server::Track;
my $mb = MusicBrainz->new;
$mb->Login;
@@ -204,7 +204,7 @@
# Create a Track object. Just as much as necessary to enter the mod.
#
- my $track = Track->new($sql->{DBH});
+ my $track = MusicBrainz::Server::Track->new($sql->{DBH});
$track->SetId($trackid);
$track->SetArtist($artistid);
$track->SetName($oldname);
Modified: mb_server/trunk/admin/cleanup/FixLength.pl
===================================================================
--- mb_server/trunk/admin/cleanup/FixLength.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/FixLength.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -28,7 +28,7 @@
use strict;
use DBDefs;
-use Album;
+use MusicBrainz::Server::Release;
use MusicBrainz;
use Getopt::Long;
@@ -86,8 +86,8 @@
no warnings 'exiting';
eval {
- require MusicBrainz::Server::AlbumCDTOC;
- my $tocs = MusicBrainz::Server::AlbumCDTOC->newFromAlbum($mb->{DBH}, $id);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ my $tocs = MusicBrainz::Server::ReleaseCDTOC->newFromRelease($mb->{DBH}, $id);
$_ = $_->GetCDTOC for @$tocs;
if ($debug)
@@ -97,9 +97,9 @@
{
print " " . $t->GetTOC . "\n";
- require Track;
+ require MusicBrainz::Server::Track;
my @l = TrackLengthsFromTOC($t);
- @l = map { Track::FormatTrackLength($_) } @l;
+ @l = map { MusicBrainz::Server::Track::FormatTrackLength($_) } @l;
print " (@l)\n";
}
}
@@ -119,7 +119,7 @@
printf " #%02d : %10d %-8s %12d\n",
$_->{sequence},
$_->{length},
- (($_->{length} > 0) ? Track::FormatTrackLength($_->{length}) : ""),
+ (($_->{length} > 0) ? MusicBrainz::Server::Track::FormatTrackLength($_->{length}) : ""),
$_->{id},
for @$tracks;
}
Modified: mb_server/trunk/admin/cleanup/RemoveAnnotations
===================================================================
--- mb_server/trunk/admin/cleanup/RemoveAnnotations 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/RemoveAnnotations 2008-03-11 11:32:23 UTC (rev 9763)
@@ -85,7 +85,7 @@
. " WHERE ( a.type = ? AND a.rowid NOT IN (SELECT id FROM artist) ) "
. " OR ( a.type = ? AND a.rowid NOT IN (SELECT id FROM album) ) ",
ARTIST_ANNOTATION,
- ALBUM_ANNOTATION,
+ RELEASE_ANNOTATION,
);
unless ( defined $ids )
Modified: mb_server/trunk/admin/cleanup/SanityCheck.pl
===================================================================
--- mb_server/trunk/admin/cleanup/SanityCheck.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/SanityCheck.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -30,7 +30,7 @@
use lib "$FindBin::Bin/../../cgi-bin";
use DBDefs;
-use Artist;
+use MusicBrainz::Server::Artist;
use ModDefs ':modstatus', 'DARTIST_ID';
use MusicBrainz;
Modified: mb_server/trunk/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/trunk/admin/cleanup/SmartQuotes 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/SmartQuotes 2008-03-11 11:32:23 UTC (rev 9763)
@@ -130,7 +130,7 @@
[ &ModDefs::MOD_EDIT_ARTISTNAME, "artist.name.id" ],
[ &ModDefs::MOD_EDIT_ARTISTSORTNAME, "artist.sortname.id" ],
[ &ModDefs::MOD_EDIT_ARTISTALIAS, "artistalias.name.ref" ],
- [ &ModDefs::MOD_EDIT_ALBUMNAME, "album.name.artist" ],
+ [ &ModDefs::MOD_EDIT_RELEASE_NAME, "album.name.artist" ],
[ &ModDefs::MOD_EDIT_TRACKNAME, "track.name.artist" ],
) {
my $modtype = $_->[0];
@@ -184,8 +184,8 @@
# Hence, we need to check for name clashes, then check for
# open "merge" mods, and not add the mod if it's already
# there.
- require Artist;
- my $ar = Artist->new($sqlWrite->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{DBH});
$ar->SetId($id);
$ar->SetName(encode "utf-8", $oname);
$ar->SetSortName(encode "utf-8", $oname);
@@ -193,8 +193,8 @@
}
elsif ($table eq "artistalias")
{
- require Alias;
- my $al = Alias->new($sqlWrite->{DBH}, 'artistalias');
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($sqlWrite->{DBH}, 'artistalias');
$al->SetId($id);
$al->SetRowId($artistid);
$al->SetName(encode "utf-8", $oname);
@@ -202,8 +202,8 @@
}
elsif ($table eq "album")
{
- require Album;
- my $al = Album->new($sqlWrite->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($sqlWrite->{DBH});
$al->SetId($id);
$al->SetArtist($artistid);
$al->SetName(encode "utf-8", $oname);
@@ -211,8 +211,8 @@
}
elsif ($table eq "track")
{
- require Track;
- my $tr = Track->new($sqlWrite->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($sqlWrite->{DBH});
$tr->SetId($id);
$tr->SetArtist($artistid);
$tr->SetName(encode "utf-8", $oname);
Modified: mb_server/trunk/admin/cleanup/UnusedTracks
===================================================================
--- mb_server/trunk/admin/cleanup/UnusedTracks 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/UnusedTracks 2008-03-11 11:32:23 UTC (rev 9763)
@@ -116,8 +116,8 @@
eval
{
- use Track;
- my $tr = Track->new($sqlWrite->{DBH});
+ use MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($sqlWrite->{DBH});
$tr->SetId($id);
$tr->Remove;
$sqlWrite->Commit;
Modified: mb_server/trunk/admin/cleanup/UpdateCoverArt.pl
===================================================================
--- mb_server/trunk/admin/cleanup/UpdateCoverArt.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/cleanup/UpdateCoverArt.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -28,7 +28,7 @@
use strict;
use DBDefs;
-use Album;
+use MusicBrainz::Server::Release;
use MusicBrainz;
use MusicBrainz::Server::CoverArt;
@@ -65,7 +65,7 @@
and (coverarturl = '' OR coverarturl is null)");
while (my ($id, $asin, $coverarturl, $url) = $sql->NextRow)
{
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId($id);
if ($al->LoadFromId(1))
{
Modified: mb_server/trunk/admin/reports/AlbumsToConvert.inc
===================================================================
--- mb_server/trunk/admin/reports/AlbumsToConvert.inc 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/AlbumsToConvert.inc 2008-03-11 11:32:23 UTC (rev 9763)
@@ -101,7 +101,7 @@
if ($row->{artist_id} != $lastartist)
{
- my $ar = Artist->new(undef);
+ my $ar = MusicBrainz::Server::Artist->new(undef);
$ar->SetId($row->{artist_id});
$ar->SetMBId($row->{artist_mbid});
$ar->SetName($row->{artist_name});
Modified: mb_server/trunk/admin/reports/AlbumsToConvert.pl
===================================================================
--- mb_server/trunk/admin/reports/AlbumsToConvert.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/AlbumsToConvert.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -32,8 +32,8 @@
package AlbumsToConvert;
use base qw( MusicBrainz::Server::ReportScript );
-use Album;
-use Artist;
+use MusicBrainz::Server::Release;
+use MusicBrainz::Server::Artist;
sub GatherData
{
@@ -85,7 +85,7 @@
for my $album (@album_ids)
{
- my $al = Album->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
$al->SetId($album);
$al->LoadFromId or next;
@@ -93,7 +93,7 @@
unless ($ar)
{
- $ar = Artist->new($self->DBH);
+ $ar = MusicBrainz::Server::Artist->new($self->DBH);
$ar->SetId($al->GetArtist);
$ar->LoadFromId or next;
Modified: mb_server/trunk/admin/reports/DuplicateAlbums
===================================================================
--- mb_server/trunk/admin/reports/DuplicateAlbums 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/DuplicateAlbums 2008-03-11 11:32:23 UTC (rev 9763)
@@ -25,8 +25,8 @@
use FindBin;
use lib "$FindBin::Bin/../../cgi-bin";
-use Album;
-use Artist;
+use MusicBrainz::Server::Release;
+use MusicBrainz::Server::Artist;
use strict;
use warnings;
@@ -75,7 +75,7 @@
my $al;
if (not exists $albums{ $album->{album_mbid} })
{
- $al = Album->new($self->DBH);
+ $al = MusicBrainz::Server::Release->new($self->DBH);
$al->SetMBId($album->{album_mbid});
unless ($al->LoadFromId(0))
{
@@ -97,7 +97,7 @@
my $ar;
if (not exists $artists{ $al->GetArtist })
{
- $ar = Artist->new($self->DBH);
+ $ar = MusicBrainz::Server::Artist->new($self->DBH);
$ar->SetId($al->GetArtist);
unless ($ar->LoadFromId)
{
Modified: mb_server/trunk/admin/reports/DuplicateArtists.inc
===================================================================
--- mb_server/trunk/admin/reports/DuplicateArtists.inc 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/DuplicateArtists.inc 2008-03-11 11:32:23 UTC (rev 9763)
@@ -37,7 +37,7 @@
</%args>
<%perl>
- use Artist;
+ use MusicBrainz::Server::Artist;
use MusicBrainz::Server::PagedReport;
use File::Basename qw( dirname );
@@ -110,7 +110,7 @@
% my $j = 0;
% foreach my $row ( @$dupelist )
% {
-% my $ar = Artist->new($mb->{DBH});
+% my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
% $ar->SetId( $row->{artist_id} );
% $ar->LoadFromId();
Modified: mb_server/trunk/admin/reports/DuplicateArtists2
===================================================================
--- mb_server/trunk/admin/reports/DuplicateArtists2 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/DuplicateArtists2 2008-03-11 11:32:23 UTC (rev 9763)
@@ -32,7 +32,7 @@
package DuplicateArtists2;
use base qw(MusicBrainz::Server::ReportScript);
-use Artist;
+use MusicBrainz::Server::Artist;
sub GatherData
@@ -67,7 +67,7 @@
my @entry;
foreach my $artist (@$artists)
{
- my $ar = Artist->new($self->DBH);
+ my $ar = MusicBrainz::Server::Artist->new($self->DBH);
$ar->SetMBId($artist->{artist_mbid});
next unless $ar->LoadFromId;
Modified: mb_server/trunk/admin/reports/DuplicateTrackNumbers
===================================================================
--- mb_server/trunk/admin/reports/DuplicateTrackNumbers 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/DuplicateTrackNumbers 2008-03-11 11:32:23 UTC (rev 9763)
@@ -32,7 +32,7 @@
package DuplicateTrackNumbers;
use base qw( MusicBrainz::Server::ReportScript );
-use Album;
+use MusicBrainz::Server::Release;
sub GatherData
{
@@ -84,7 +84,7 @@
ORDER BY
ar.sortname, al.name
EOF
- [ &Album::ALBUM_ATTR_NONALBUMTRACKS ],
+ [ &MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS ],
);
}
Modified: mb_server/trunk/admin/reports/PUIDsWithManyTracks.inc
===================================================================
--- mb_server/trunk/admin/reports/PUIDsWithManyTracks.inc 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/PUIDsWithManyTracks.inc 2008-03-11 11:32:23 UTC (rev 9763)
@@ -142,7 +142,7 @@
strong => 0
&></td>
<td>
- <% Track::FormatTrackLength($track->{'length'}) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($track->{'length'}) %></td>
</tr>
<%perl>
Modified: mb_server/trunk/admin/reports/SuperfluousDataTracks
===================================================================
--- mb_server/trunk/admin/reports/SuperfluousDataTracks 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/SuperfluousDataTracks 2008-03-11 11:32:23 UTC (rev 9763)
@@ -32,13 +32,13 @@
package SuperfluousDataTracks;
use base qw( MusicBrainz::Server::ReportScript );
-use Album;
+use MusicBrainz::Server::Release;
sub GatherData
{
my $self = shift;
- $self->GatherDataFromQuery(<<'EOF', [ &Album::NONALBUMTRACKS_NAME ]);
+ $self->GatherDataFromQuery(<<'EOF', [ &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME ]);
SELECT
ar.id AS artist_id,
ar.name AS artist_name,
Modified: mb_server/trunk/admin/reports/TRMsWithManyTracks.inc
===================================================================
--- mb_server/trunk/admin/reports/TRMsWithManyTracks.inc 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/TRMsWithManyTracks.inc 2008-03-11 11:32:23 UTC (rev 9763)
@@ -142,7 +142,7 @@
strong => 0
&></td>
<td>
- <% Track::FormatTrackLength($track->{'length'}) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($track->{'length'}) %></td>
</tr>
<%perl>
Modified: mb_server/trunk/admin/reports/TracksNamedWithSequence.pl
===================================================================
--- mb_server/trunk/admin/reports/TracksNamedWithSequence.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/reports/TracksNamedWithSequence.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -34,8 +34,8 @@
use MusicBrainz::Server::Validation;
use Encode qw( decode );
-use Album;
-use Artist;
+use MusicBrainz::Server::Release;
+use MusicBrainz::Server::Artist;
sub GatherData
{
@@ -71,8 +71,8 @@
push @{ $artists->{ $_->[0] }{ALBUMS}{ $_->[1] }{TRACKS} }, $_;
}
- my $al = Album->new($self->{DBH});
- my $ar = Artist->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
for my $artistid (keys %$artists)
{
Modified: mb_server/trunk/admin/sql/updates/20040326-1.pl
===================================================================
--- mb_server/trunk/admin/sql/updates/20040326-1.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/sql/updates/20040326-1.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -66,15 +66,15 @@
eval {
$sql->Begin;
- require Artist;
- my $ar = Artist->new($mb->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetId($id);
$ar->LoadFromId or die "No artist #$id";
unless ($name eq $_->[1])
{
# Is there already an artist with the new name?
- my $mergeinto = Artist->new($mb->{DBH});
+ my $mergeinto = MusicBrainz::Server::Artist->new($mb->{DBH});
if ($mergeinto->LoadFromName($name) and $mergeinto->GetName eq $name)
{
# Merge $ar into $mergeinto
@@ -141,8 +141,8 @@
eval {
$sql->Begin;
- require Album;
- my $al = Album->new($mb->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
$al->SetId($id);
$al->LoadFromId or die "No album #$id";
@@ -182,8 +182,8 @@
eval {
$sql->Begin;
- require Track;
- my $tr = Track->new($mb->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($mb->{DBH});
$tr->SetId($id);
$tr->LoadFromId or die "No track #$id";
@@ -223,8 +223,8 @@
eval {
$sql->Begin;
- require Alias;
- my $alias = Alias->new($mb->{DBH}, "artistalias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "artistalias");
$alias->SetId($id);
$alias->LoadFromId or die "No artist alias #$id";
Modified: mb_server/trunk/admin/sql/updates/20060305-2.pl
===================================================================
--- mb_server/trunk/admin/sql/updates/20060305-2.pl 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/sql/updates/20060305-2.pl 2008-03-11 11:32:23 UTC (rev 9763)
@@ -37,7 +37,7 @@
require DBDefs;
require MusicBrainz;
require Sql;
-require Album;
+require MusicBrainz::Server::Release;
my $verbose = 1;
@@ -71,7 +71,7 @@
my %done;
for my $link (@$rows)
{
- my $al = Album->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{DBH});
my $alid = $link->{alid};
$al->SetId($alid);
Modified: mb_server/trunk/admin/startup.pl.default
===================================================================
--- mb_server/trunk/admin/startup.pl.default 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/admin/startup.pl.default 2008-03-11 11:32:23 UTC (rev 9763)
@@ -44,13 +44,13 @@
require DBDefs;
require ModDefs;
-require Album;
-require Alias;
-require Artist;
+require MusicBrainz::Server::Release;
+require MusicBrainz::Server::Alias;
+require MusicBrainz::Server::Artist;
require DebugLog;
require FreeDB;
require Insert;
-require Label;
+require MusicBrainz::Server::Label;
require LocaleSaver;
# require MM;
# require MM_2_0;
@@ -60,7 +60,7 @@
require MusicBrainz::Server::Annotation;
require MusicBrainz::Server::Attribute;
require MusicBrainz::Server::AutomodElection;
-require MusicBrainz::Server::AlbumCDTOC;
+require MusicBrainz::Server::ReleaseCDTOC;
require MusicBrainz::Server::Cache;
require MusicBrainz::Server::CDTOC;
require MusicBrainz::Server::Country;
@@ -79,7 +79,7 @@
require MusicBrainz::Server::ModerationNote;
require MusicBrainz::Server::NewsFeed;
require MusicBrainz::Server::PagedReport;
-require MusicBrainz::Server::Release;
+require MusicBrainz::Server::ReleaseEvent;
require MusicBrainz::Server::Replication;
require MusicBrainz::Server::Script;
require MusicBrainz::Server::Tag;
@@ -100,9 +100,9 @@
require Style;
require TableBase;
require TaggerSupport;
-require Track;
-require TRM;
-require PUID;
+require MusicBrainz::Server::Track;
+require MusicBrainz::Server::TRM;
+require MusicBrainz::Server::PUID;
require UserPreference;
require UserStuff;
require UserSubscription;
Deleted: mb_server/trunk/cgi-bin/Album.pm
Deleted: mb_server/trunk/cgi-bin/Alias.pm
Deleted: mb_server/trunk/cgi-bin/Artist.pm
Modified: mb_server/trunk/cgi-bin/FreeDB.pm
===================================================================
--- mb_server/trunk/cgi-bin/FreeDB.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/FreeDB.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -49,7 +49,7 @@
}, ref($class) || $class;
}
-# Public. Called from MusicBrainz::Server::AlbumCDTOC->GenerateAlbumFromDiscid;
+# Public. Called from MusicBrainz::Server::ReleaseCDTOC->GenerateAlbumFromDiscid;
sub Lookup
{
my ($this, $Discid, $toc) = @_;
@@ -331,7 +331,7 @@
return \%info;
}
-# Public. Called by MusicBrainz::Server::AlbumCDTOC->GenerateAlbumFromDiscid
+# Public. Called by MusicBrainz::Server::ReleaseCDTOC->GenerateAlbumFromDiscid
sub InsertForModeration
{
@@ -366,10 +366,10 @@
$info->{sortname} = $st->MakeDefaultSortname($info->{artist});
- require Alias;
- require Artist;
- $alias = Alias->new($this->{DBH});
- $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Alias;
+ require MusicBrainz::Server::Artist;
+ $alias = MusicBrainz::Server::Alias->new($this->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($this->{DBH});
# Check to see if the artist has an alias.
$alias->{table} = "ArtistAlias";
@@ -403,7 +403,7 @@
}
my $album = lc(decode "utf-8", $info->{album});
- @albums = $ar->GetAlbums();
+ @albums = $ar->GetReleases();
foreach $al (@albums)
{
my $thisname = lc(decode "utf-8", $al->GetName);
Modified: mb_server/trunk/cgi-bin/Insert.pm
===================================================================
--- mb_server/trunk/cgi-bin/Insert.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/Insert.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -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 => ...
@@ -207,19 +207,19 @@
die "Insert failed: you cannot force a new album and provide an albumid.\n";
}
- require Artist;
- my $ar = Artist->new($this->{DBH});
- my $mar = Artist->new($this->{DBH});
- require Album;
- my $al = Album->new($this->{DBH});
- require Track;
- my $tr = Track->new($this->{DBH});
- require TRM;
- my $trm = TRM->new($this->{DBH});
- require PUID;
- my $puid = PUID->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
+ my $mar = MusicBrainz::Server::Artist->new($this->{DBH});
require MusicBrainz::Server::Release;
- my $rel = MusicBrainz::Server::Release->new($this->{DBH});
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trm = MusicBrainz::Server::TRM->new($this->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $puid = MusicBrainz::Server::PUID->new($this->{DBH});
+ require MusicBrainz::Server::ReleaseEvent;
+ my $rel = MusicBrainz::Server::ReleaseEvent->new($this->{DBH});
my $artist;
my $artistid;
@@ -415,8 +415,8 @@
# If a valid cdindexid and toc was supplied, then insert that now
if (exists $info->{cdindexid} && exists $info->{toc})
{
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->Insert($this->{DBH}, $albumid, $info->{toc});
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->Insert($this->{DBH}, $albumid, $info->{toc});
$info->{cdindexid_insertid} = $info->{cdindexid};
}
@@ -613,7 +613,7 @@
die "Skipped Insert: Release country is required\n";
}
- $rel->SetAlbum($albumid);
+ $rel->SetRelease($albumid);
$rel->SetYMD(@ymd);
$rel->SetCountry($release->{country});
$rel->SetLabel($release->{label});
@@ -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(
Deleted: mb_server/trunk/cgi-bin/Label.pm
Modified: mb_server/trunk/cgi-bin/MM.pm
===================================================================
--- mb_server/trunk/cgi-bin/MM.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MM.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -138,20 +138,20 @@
$this->{cache} = [];
for my $id (@{$gids})
{
- require Track;
- my $tr = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($this->{DBH});
$tr->SetMBId($id);
$tr->LoadFromId();
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($tr->GetArtist());
# TODO This is complaining about the ID being undef
$ar->LoadFromId();
- require Album;
- my $al = Album->new($this->{DBH});
- my @ids = $al->GetAlbumIdsFromTrackId($tr->GetId());
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
+ my @ids = $al->GetReleaseIdsFromTrackId($tr->GetId());
$al->SetId($ids[0]);
# TODO this is complaining that the album ID is false
$al->LoadFromId();
@@ -192,18 +192,18 @@
for my $id (@$gids)
{
- require Album;
- my $al = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $al = MusicBrainz::Server::Release->new($this->{DBH});
$al->SetMBId($id);
$al->LoadFromId(1);
- require Artist;
- my $ar = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ my $ar = MusicBrainz::Server::Artist->new($this->{DBH});
$ar->SetId($al->GetArtist);
$ar->LoadFromId;
$this->AddToCache(0, 'artist', $ar);
- require Track;
+ require MusicBrainz::Server::Track;
my @tracks = $al->LoadTracks;
my $is_va = $al->GetArtist == VARTIST_ID || $al->HasMultipleTrackArtists;
@@ -214,7 +214,7 @@
{
if ($is_va)
{
- my $var = Artist->new($this->{DBH});
+ my $var = MusicBrainz::Server::Artist->new($this->{DBH});
$var->SetId($tr->GetArtist);
if ($var->LoadFromId)
{
@@ -438,8 +438,8 @@
if ($type eq "trmid")
{
- require TRM;
- $obj = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ $obj = MusicBrainz::Server::TRM->new($this->{DBH});
$obj->SetTRM($id);
# Most of the code around here assumes that "GetId" or "GetMBId"
# return something sensible, so here we pretend that the TRM is
@@ -451,18 +451,18 @@
}
elsif ($type eq 'artist')
{
- require Artist;
- $obj = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $obj = MusicBrainz::Server::Artist->new($this->{DBH});
}
elsif ($type eq 'album')
{
- require Album;
- $obj = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ $obj = MusicBrainz::Server::Release->new($this->{DBH});
}
elsif ($type eq 'track')
{
- require Track;
- $obj = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ $obj = MusicBrainz::Server::Track->new($this->{DBH});
}
elsif ($type eq 'trmid')
{
@@ -550,7 +550,7 @@
return ();
}
- @albums = $artist->GetAlbums();
+ @albums = $artist->GetReleases();
foreach $album (@albums)
{
next if not defined $album;
Modified: mb_server/trunk/cgi-bin/MM_2_0.pm
===================================================================
--- mb_server/trunk/cgi-bin/MM_2_0.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MM_2_0.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -125,13 +125,13 @@
my @attrs = $album->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $this->Element("rdf:type", "", "rdf:resource", $this->GetMMNamespace() . $album->GetAttributeName($attr));
}
- elsif ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $this->Element("mm:release", "", "rdf:resource", $this->GetMMNamespace() . $album->GetAttributeName($attr));
}
@@ -168,8 +168,8 @@
}
$track = $ref->{obj};
- require TRM;
- $gu = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ $gu = MusicBrainz::Server::TRM->new($this->{DBH});
@TRM = $gu->GetTRMFromTrackId($track->GetId());
$artist = $this->GetFromCache('artist', $track->GetArtist());
Modified: mb_server/trunk/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/trunk/cgi-bin/MM_2_1.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MM_2_1.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -85,7 +85,7 @@
$out .= $this->Element("dc:comment", $artist->GetResolution) if ($artist->GetResolution);
$out .= $this->Element("mm:artistType", "", "rdf:resource", $this->GetMMNamespace() .
- "Type" . &Artist::GetTypeName($artist->GetType)) if ($artist->GetType);
+ "Type" . &MusicBrainz::Server::Artist::GetTypeName($artist->GetType)) if ($artist->GetType);
$out .= $this->OutputRelationships($ref->{_relationships})
if (exists $ref->{_relationships});
@@ -120,7 +120,7 @@
$album = $ref->{obj};
$artist = $this->GetFromCache('artist', $album->GetArtist());
- @releases = $album->Releases;
+ @releases = $album->ReleaseEvents;
require MusicBrainz::Server::Country;
my $country_obj = MusicBrainz::Server::Country->new($album->{DBH})
if @releases;
@@ -170,14 +170,14 @@
my @attrs = $album->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= Album::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $this->Element("mm:releaseType", "", "rdf:resource", $this->GetMMNamespace() .
"Type" . $album->GetAttributeName($attr));
}
- elsif ($attr >= Album::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= Album::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $this->Element("mm:releaseStatus", "", "rdf:resource", $this->GetMMNamespace() .
"Status" . $album->GetAttributeName($attr));
@@ -228,7 +228,7 @@
if (scalar(@$ids))
{
$complete = $$ids[scalar(@$ids) - 1]->{tracknum} != (scalar(@$ids) + 1);
- $complete = 1 if (!$complete && $album->GetName() eq &Album::NONALBUMTRACKS_NAME);
+ $complete = 1 if (!$complete && $album->GetName() eq &MusicBrainz::Server::Release::NONALBUMTRACKS_NAME);
foreach $track (@$ids)
{
my $li = $complete ? "rdf:li" : ("rdf:_" . $track->{tracknum});
@@ -297,8 +297,8 @@
$out .= $this->OutputRelationships($ref->{_relationships})
if (exists $ref->{_relationships});
- require TRM;
- $gu = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ $gu = MusicBrainz::Server::TRM->new($this->{DBH});
if ($track->GetId())
{
@TRM = $gu->GetTRMFromTrackId($track->GetId());
@@ -576,8 +576,8 @@
{
my $artist;
- require Artist;
- $artist = Artist->new($this->{DBH});
+ require MusicBrainz::Server::Artist;
+ $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($tr->GetArtist());
$artist->LoadFromId();
$this->AddToCache(0, 'artist', $artist);
@@ -796,19 +796,19 @@
my ($type, $id) = split '-', $item;
if ($type eq 'artist')
{
- $temp = Artist->new($this->{DBH});
+ $temp = MusicBrainz::Server::Artist->new($this->{DBH});
$temp->SetId($id);
die if (!$temp->LoadFromId());
$out .= $this->OutputArtistRDF({ obj=> $temp });
} elsif ($type eq 'album')
{
- $temp = Album->new($this->{DBH});
+ $temp = MusicBrainz::Server::Release->new($this->{DBH});
$temp->SetId($id);
die if (!$temp->LoadFromId());
$out .= $this->OutputAlbumRDF({ obj=> $temp });
} elsif ($type eq 'track')
{
- $temp = Track->new($this->{DBH});
+ $temp = MusicBrainz::Server::Track->new($this->{DBH});
$temp->SetId($id);
die if (!$temp->LoadFromId());
$out .= $this->OutputTrackRDF({ obj=> $temp });
Modified: mb_server/trunk/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/trunk/cgi-bin/ModDefs.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/ModDefs.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -75,35 +75,35 @@
# The various moderations, enumerated
use constant MOD_EDIT_ARTISTNAME => 1;
use constant MOD_EDIT_ARTISTSORTNAME => 2;
-use constant MOD_EDIT_ALBUMNAME => 3;
+use constant MOD_EDIT_RELEASE_NAME => 3;
use constant MOD_EDIT_TRACKNAME => 4;
use constant MOD_EDIT_TRACKNUM => 5;
use constant MOD_MERGE_ARTIST => 6;
use constant MOD_ADD_TRACK => 7;
-use constant MOD_MOVE_ALBUM => 8;
+use constant MOD_MOVE_RELEASE => 8;
use constant MOD_SAC_TO_MAC => 9;
use constant MOD_CHANGE_TRACK_ARTIST => 10;
use constant MOD_REMOVE_TRACK => 11;
-use constant MOD_REMOVE_ALBUM => 12;
+use constant MOD_REMOVE_RELEASE => 12;
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;
use constant MOD_REMOVE_DISCID => 20;
use constant MOD_MOVE_DISCID => 21;
use constant MOD_REMOVE_TRMID => 22;
-use constant MOD_MERGE_ALBUM => 23;
-use constant MOD_REMOVE_ALBUMS => 24;
-use constant MOD_MERGE_ALBUM_MAC => 25;
-use constant MOD_EDIT_ALBUMATTRS => 26;
+use constant MOD_MERGE_RELEASE => 23;
+use constant MOD_REMOVE_RELEASES => 24;
+use constant MOD_MERGE_RELEASE_MAC => 25;
+use constant MOD_EDIT_RELEASE_ATTRS => 26;
use constant MOD_ADD_TRMS => 27;
use constant MOD_EDIT_ARTISTALIAS => 28;
-use constant MOD_EDIT_RELEASES => 29;
+use constant MOD_EDIT_RELEASE_EVENTS_OLD => 29;
use constant MOD_ADD_ARTIST_ANNOTATION => 30;
-use constant MOD_ADD_ALBUM_ANNOTATION => 31;
+use constant MOD_ADD_RELEASE_ANNOTATION => 31;
use constant MOD_ADD_DISCID => 32;
use constant MOD_ADD_LINK => 33;
use constant MOD_EDIT_LINK => 34;
@@ -116,14 +116,14 @@
use constant MOD_ADD_LINK_ATTR => 41;
use constant MOD_EDIT_LINK_ATTR => 42;
use constant MOD_REMOVE_LINK_ATTR => 43;
-use constant MOD_EDIT_ALBUM_LANGUAGE => 44;
+use constant MOD_EDIT_RELEASE_LANGUAGE => 44;
use constant MOD_EDIT_TRACKTIME => 45;
use constant MOD_REMOVE_PUID => 46;
use constant MOD_ADD_PUIDS => 47;
use constant MOD_CHANGE_WIKIDOC => 48;
-use constant MOD_ADD_RELEASEEVENTS => 49;
-use constant MOD_EDIT_RELEASEEVENTS => 50;
-use constant MOD_REMOVE_RELEASEEVENTS => 51;
+use constant MOD_ADD_RELEASE_EVENTS => 49;
+use constant MOD_EDIT_RELEASE_EVENTS => 50;
+use constant MOD_REMOVE_RELEASE_EVENTS => 51;
use constant MOD_CHANGE_ARTIST_QUALITY => 52;
use constant MOD_SET_RELEASE_DURATIONS => 53;
use constant MOD_ADD_LABEL => 54;
@@ -270,8 +270,8 @@
# DataQuality level moderations catogorization
my %ModCategories = (
- MOD_ADD_ALBUM . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
- MOD_ADD_ALBUM_ANNOTATION . "" => {'category' => CAT_NONE, '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' => ""},
MOD_ADD_ARTIST_ANNOTATION . "" => {'category' => CAT_NONE, 'criteria' => ""},
@@ -283,7 +283,7 @@
MOD_ADD_LINK_ATTR . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_ADD_LINK_TYPE . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_ADD_PUIDS . "" => {'category' => CAT_NONE, 'criteria' => ""},
- MOD_ADD_RELEASEEVENTS . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_ADD_RELEASE_EVENTS . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_ADD_TRACK . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_ADD_TRACK_ANNOTATION . "" => {'category' => CAT_NONE, 'criteria' => ""},
MOD_ADD_TRACK_KV . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
@@ -292,9 +292,9 @@
MOD_CHANGE_RELEASE_QUALITY . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_CHANGE_TRACK_ARTIST . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
MOD_CHANGE_WIKIDOC . "" => {'category' => CAT_NONE, 'criteria' => ""},
- MOD_EDIT_ALBUM_LANGUAGE . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no language was set"},
- MOD_EDIT_ALBUMATTRS . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no attributes where set"},
- MOD_EDIT_ALBUMNAME . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when changing capitalisation or accents"},
+ MOD_EDIT_RELEASE_LANGUAGE . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no language was set"},
+ MOD_EDIT_RELEASE_ATTRS . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no attributes where set"},
+ MOD_EDIT_RELEASE_NAME . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when changing capitalisation or accents"},
MOD_EDIT_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when providing new properties (Begin Date, End Date or Type) or changing capitalisation or accents"},
MOD_EDIT_ARTISTALIAS . "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when changing capitalisation or accents"},
MOD_EDIT_ARTISTNAME . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
@@ -304,21 +304,21 @@
MOD_EDIT_LINK . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_EDIT_LINK_ATTR . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_EDIT_LINK_TYPE . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
- MOD_EDIT_RELEASES . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
- MOD_EDIT_RELEASEEVENTS . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when providing supplemental information"},
+ MOD_EDIT_RELEASE_EVENTS_OLD . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_EDIT_RELEASE_EVENTS . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when providing supplemental information"},
MOD_EDIT_TRACKNAME . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when changing capitalisation or accents"},
MOD_EDIT_TRACKNUM . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_EDIT_TRACKTIME . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no times where set"},
MOD_EDIT_URL . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_MAC_TO_SAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
- MOD_MERGE_ALBUM . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
- MOD_MERGE_ALBUM_MAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
+ MOD_MERGE_RELEASE . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
+ MOD_MERGE_RELEASE_MAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
MOD_MERGE_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => "Level of artist with highest level"},
MOD_MERGE_LABEL . "" => {'category' => CAT_NONE, 'criteria' => ""},
- MOD_MOVE_ALBUM . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
+ MOD_MOVE_RELEASE . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
MOD_MOVE_DISCID . "" => {'category' => CAT_RELEASE, 'criteria' => "Level of release with highest level"},
- MOD_REMOVE_ALBUM . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
- MOD_REMOVE_ALBUMS . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_REMOVE_RELEASE . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_REMOVE_RELEASES . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_REMOVE_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
MOD_REMOVE_ARTISTALIAS . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
MOD_REMOVE_DISCID . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
@@ -328,7 +328,7 @@
MOD_REMOVE_LINK_ATTR . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_REMOVE_LINK_TYPE . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_REMOVE_PUID . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
- MOD_REMOVE_RELEASEEVENTS . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_REMOVE_RELEASE_EVENTS . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_REMOVE_TRACK . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_REMOVE_TRMID . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_SAC_TO_MAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or current artist"},
Modified: mb_server/trunk/cgi-bin/Moderation.pm
===================================================================
--- mb_server/trunk/cgi-bin/Moderation.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/Moderation.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -35,8 +35,8 @@
use utf8;
# Load all the moderation handlers (sorted please)
-require MusicBrainz::Server::Moderation::MOD_ADD_ALBUM;
-require MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION;
+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;
require MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION;
@@ -49,7 +49,7 @@
require MusicBrainz::Server::Moderation::MOD_ADD_LINK_ATTR;
require MusicBrainz::Server::Moderation::MOD_ADD_LINK_TYPE;
require MusicBrainz::Server::Moderation::MOD_ADD_PUIDS;
-require MusicBrainz::Server::Moderation::MOD_ADD_RELEASEEVENTS;
+require MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_EVENTS;
require MusicBrainz::Server::Moderation::MOD_ADD_TRACK;
require MusicBrainz::Server::Moderation::MOD_ADD_TRACK_KV;
require MusicBrainz::Server::Moderation::MOD_ADD_TRMS;
@@ -57,9 +57,9 @@
require MusicBrainz::Server::Moderation::MOD_CHANGE_RELEASE_QUALITY;
require MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST;
require MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC;
-require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE;
-require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS;
-require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME;
require MusicBrainz::Server::Moderation::MOD_EDIT_ARTIST;
require MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTALIAS;
require MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME;
@@ -69,22 +69,22 @@
require MusicBrainz::Server::Moderation::MOD_EDIT_LINK;
require MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR;
require MusicBrainz::Server::Moderation::MOD_EDIT_LINK_TYPE;
-require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASEEVENTS;
-require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS_OLD;
require MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME;
require MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNUM;
require MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME;
require MusicBrainz::Server::Moderation::MOD_EDIT_URL;
require MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC;
-require MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM;
-require MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC;
+require MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE;
+require MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC;
require MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST;
require MusicBrainz::Server::Moderation::MOD_MERGE_LABEL;
# require MusicBrainz::Server::Moderation::MOD_MERGE_LINK_TYPE; -- not implemented
-require MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM;
+require MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE;
require MusicBrainz::Server::Moderation::MOD_MOVE_DISCID;
-require MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM;
-require MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS;
+require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE;
+require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES;
require MusicBrainz::Server::Moderation::MOD_REMOVE_ARTIST;
require MusicBrainz::Server::Moderation::MOD_REMOVE_ARTISTALIAS;
require MusicBrainz::Server::Moderation::MOD_REMOVE_DISCID;
@@ -94,7 +94,7 @@
require MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR;
require MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_TYPE;
require MusicBrainz::Server::Moderation::MOD_REMOVE_PUID;
-require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASEEVENTS;
+require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE_EVENTS;
require MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK;
require MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID;
require MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC;
@@ -108,8 +108,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME::Name() },
MOD_EDIT_ARTISTSORTNAME ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTSORTNAME::Name() },
- MOD_EDIT_ALBUMNAME ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME::Name() },
+ MOD_EDIT_RELEASE_NAME ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME::Name() },
MOD_EDIT_TRACKNAME ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME::Name() },
MOD_EDIT_TRACKNUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -118,24 +118,24 @@
name => &MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST::Name() },
MOD_ADD_TRACK ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK::Name() },
- MOD_MOVE_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM::Name() },
+ MOD_MOVE_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE::Name() },
MOD_SAC_TO_MAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC::Name() },
MOD_CHANGE_TRACK_ARTIST ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST::Name() },
MOD_REMOVE_TRACK ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK::Name() },
- MOD_REMOVE_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM::Name() },
+ MOD_REMOVE_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE::Name() },
MOD_MAC_TO_SAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC::Name() },
MOD_REMOVE_ARTISTALIAS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
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,
@@ -148,24 +148,24 @@
name => &MusicBrainz::Server::Moderation::MOD_MOVE_DISCID::Name() },
MOD_REMOVE_TRMID ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID::Name() },
- MOD_MERGE_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM::Name() },
- MOD_REMOVE_ALBUMS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS::Name() },
- MOD_MERGE_ALBUM_MAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC::Name() },
- MOD_EDIT_ALBUMATTRS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS::Name() },
+ MOD_MERGE_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE::Name() },
+ MOD_REMOVE_RELEASES ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::Name() },
+ MOD_MERGE_RELEASE_MAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC::Name() },
+ MOD_EDIT_RELEASE_ATTRS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRMS::Name() },
MOD_EDIT_ARTISTALIAS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTALIAS::Name() },
- MOD_EDIT_RELEASES ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES::Name() },
+ MOD_EDIT_RELEASE_EVENTS_OLD ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS_OLD::Name() },
MOD_ADD_ARTIST_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION::Name() },
- MOD_ADD_ALBUM_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION::Name() },
+ MOD_ADD_RELEASE_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION::Name() },
MOD_ADD_TRACK_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK_ANNOTATION::Name() },
MOD_ADD_DISCID ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -190,8 +190,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR::Name() },
MOD_REMOVE_LINK_ATTR ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR::Name() },
- MOD_EDIT_ALBUM_LANGUAGE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE::Name() },
+ MOD_EDIT_RELEASE_LANGUAGE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE::Name() },
MOD_EDIT_TRACKTIME ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME::Name() },
MOD_REMOVE_PUID ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -200,12 +200,12 @@
name => &MusicBrainz::Server::Moderation::MOD_ADD_PUIDS::Name() },
MOD_CHANGE_WIKIDOC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC::Name() },
- MOD_ADD_RELEASEEVENTS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASEEVENTS::Name() },
- MOD_EDIT_RELEASEEVENTS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASEEVENTS::Name() },
- MOD_REMOVE_RELEASEEVENTS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASEEVENTS::Name() },
+ MOD_ADD_RELEASE_EVENTS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_EVENTS::Name() },
+ MOD_EDIT_RELEASE_EVENTS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS::Name() },
+ MOD_REMOVE_RELEASE_EVENTS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE_EVENTS::Name() },
MOD_SET_RELEASE_DURATIONS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_SET_RELEASE_DURATIONS::Name() },
MOD_EDIT_URL ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -232,8 +232,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME::Name() },
MOD_EDIT_ARTISTSORTNAME ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTSORTNAME::Name() },
- MOD_EDIT_ALBUMNAME ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME::Name() },
+ MOD_EDIT_RELEASE_NAME ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME::Name() },
MOD_EDIT_TRACKNAME ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME::Name() },
MOD_EDIT_TRACKNUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -242,24 +242,24 @@
name => &MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST::Name() },
MOD_ADD_TRACK ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK::Name() },
- MOD_MOVE_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM::Name() },
+ MOD_MOVE_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE::Name() },
MOD_SAC_TO_MAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC::Name() },
MOD_CHANGE_TRACK_ARTIST ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST::Name() },
MOD_REMOVE_TRACK ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK::Name() },
- MOD_REMOVE_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM::Name() },
+ MOD_REMOVE_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE::Name() },
MOD_MAC_TO_SAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC::Name() },
MOD_REMOVE_ARTISTALIAS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
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,
@@ -272,24 +272,24 @@
name => &MusicBrainz::Server::Moderation::MOD_MOVE_DISCID::Name() },
MOD_REMOVE_TRMID ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID::Name() },
- MOD_MERGE_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM::Name() },
- MOD_REMOVE_ALBUMS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS::Name() },
- MOD_MERGE_ALBUM_MAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC::Name() },
- MOD_EDIT_ALBUMATTRS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS::Name() },
+ MOD_MERGE_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE::Name() },
+ MOD_REMOVE_RELEASES ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::Name() },
+ MOD_MERGE_RELEASE_MAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC::Name() },
+ MOD_EDIT_RELEASE_ATTRS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRMS::Name() },
MOD_EDIT_ARTISTALIAS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTALIAS::Name() },
- MOD_EDIT_RELEASES ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES::Name() },
+ MOD_EDIT_RELEASE_EVENTS_OLD ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS_OLD::Name() },
MOD_ADD_ARTIST_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION::Name() },
- MOD_ADD_ALBUM_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION::Name() },
+ MOD_ADD_RELEASE_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION::Name() },
MOD_ADD_TRACK_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK_ANNOTATION::Name() },
MOD_ADD_DISCID ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -314,8 +314,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR::Name() },
MOD_REMOVE_LINK_ATTR ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR::Name() },
- MOD_EDIT_ALBUM_LANGUAGE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE::Name() },
+ MOD_EDIT_RELEASE_LANGUAGE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE::Name() },
MOD_EDIT_TRACKTIME ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME::Name() },
MOD_REMOVE_PUID ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -324,12 +324,12 @@
name => &MusicBrainz::Server::Moderation::MOD_ADD_PUIDS::Name() },
MOD_CHANGE_WIKIDOC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC::Name() },
- MOD_ADD_RELEASEEVENTS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASEEVENTS::Name() },
- MOD_EDIT_RELEASEEVENTS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASEEVENTS::Name() },
- MOD_REMOVE_RELEASEEVENTS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASEEVENTS::Name() },
+ MOD_ADD_RELEASE_EVENTS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_EVENTS::Name() },
+ MOD_EDIT_RELEASE_EVENTS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS::Name() },
+ MOD_REMOVE_RELEASE_EVENTS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE_EVENTS::Name() },
MOD_SET_RELEASE_DURATIONS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_SET_RELEASE_DURATIONS::Name() },
MOD_EDIT_URL ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -356,8 +356,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME::Name() },
MOD_EDIT_ARTISTSORTNAME ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTSORTNAME::Name() },
- MOD_EDIT_ALBUMNAME ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME::Name() },
+ MOD_EDIT_RELEASE_NAME ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME::Name() },
MOD_EDIT_TRACKNAME ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME::Name() },
MOD_EDIT_TRACKNUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -366,24 +366,24 @@
name => &MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST::Name() },
MOD_ADD_TRACK ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK::Name() },
- MOD_MOVE_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM::Name() },
+ MOD_MOVE_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE::Name() },
MOD_SAC_TO_MAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC::Name() },
MOD_CHANGE_TRACK_ARTIST ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST::Name() },
MOD_REMOVE_TRACK ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK::Name() },
- MOD_REMOVE_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM::Name() },
+ MOD_REMOVE_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE::Name() },
MOD_MAC_TO_SAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC::Name() },
MOD_REMOVE_ARTISTALIAS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
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,
@@ -396,24 +396,24 @@
name => &MusicBrainz::Server::Moderation::MOD_MOVE_DISCID::Name() },
MOD_REMOVE_TRMID ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID::Name() },
- MOD_MERGE_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM::Name() },
- MOD_REMOVE_ALBUMS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS::Name() },
- MOD_MERGE_ALBUM_MAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC::Name() },
- MOD_EDIT_ALBUMATTRS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS::Name() },
+ MOD_MERGE_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE::Name() },
+ MOD_REMOVE_RELEASES ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::Name() },
+ MOD_MERGE_RELEASE_MAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC::Name() },
+ MOD_EDIT_RELEASE_ATTRS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRMS::Name() },
MOD_EDIT_ARTISTALIAS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTALIAS::Name() },
- MOD_EDIT_RELEASES ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES::Name() },
+ MOD_EDIT_RELEASE_EVENTS_OLD ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS_OLD::Name() },
MOD_ADD_ARTIST_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION::Name() },
- MOD_ADD_ALBUM_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION::Name() },
+ MOD_ADD_RELEASE_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION::Name() },
MOD_ADD_TRACK_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK_ANNOTATION::Name() },
MOD_ADD_DISCID ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -438,8 +438,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR::Name() },
MOD_REMOVE_LINK_ATTR ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR::Name() },
- MOD_EDIT_ALBUM_LANGUAGE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE::Name() },
+ MOD_EDIT_RELEASE_LANGUAGE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE::Name() },
MOD_EDIT_TRACKTIME ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME::Name() },
MOD_REMOVE_PUID ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -448,12 +448,12 @@
name => &MusicBrainz::Server::Moderation::MOD_ADD_PUIDS::Name() },
MOD_CHANGE_WIKIDOC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC::Name() },
- MOD_ADD_RELEASEEVENTS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASEEVENTS::Name() },
- MOD_EDIT_RELEASEEVENTS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASEEVENTS::Name() },
- MOD_REMOVE_RELEASEEVENTS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASEEVENTS::Name() },
+ MOD_ADD_RELEASE_EVENTS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_EVENTS::Name() },
+ MOD_EDIT_RELEASE_EVENTS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_EVENTS::Name() },
+ MOD_REMOVE_RELEASE_EVENTS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE_EVENTS::Name() },
MOD_SET_RELEASE_DURATIONS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_SET_RELEASE_DURATIONS::Name() },
MOD_EDIT_URL ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -1386,7 +1386,7 @@
$sql->Finish;
# Fetch artists, and cache by artistid.
- require Artist;
+ require MusicBrainz::Server::Artist;
my %artist_cache;
# Cache editors by name
@@ -1411,7 +1411,7 @@
my $artistid = $edit->GetArtist;
if (not defined $artist_cache{$artistid})
{
- my $artist = Artist->new($this->{DBH});
+ my $artist = MusicBrainz::Server::Artist->new($this->{DBH});
$artist->SetId($artistid);
if ($artist->LoadFromId())
{
@@ -1723,8 +1723,8 @@
# implementations of the edit types
if ($this->{"checkexists-track"} && defined $this->{"trackid"})
{
- require Track;
- my $track = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->{"trackid"});
if ($this->{"exists-track"} = $track->LoadFromId)
{
@@ -1735,7 +1735,7 @@
# assume that the release needs to be loaded from
# the album-track core relationship, if it not
# has been set explicitly.
- $this->{"albumid"} = $track->GetAlbum if ($this->{"checkexists-album"} && not defined $this->{"albumid"});
+ $this->{"albumid"} = $track->GetRelease if ($this->{"checkexists-album"} && not defined $this->{"albumid"});
}
}
@@ -1744,8 +1744,8 @@
# implementations of the edit types
if ($this->{"checkexists-album"} && defined $this->{"albumid"})
{
- require Album;
- my $release = Album->new($this->{DBH});
+ require MusicBrainz::Server::Release;
+ my $release = MusicBrainz::Server::Release->new($this->{DBH});
$release->SetId($this->{"albumid"});
if ($this->{"exists-album"} = $release->LoadFromId)
{
@@ -1758,11 +1758,11 @@
# do not display release if we have a batch edit type
$this->{"albumid"} = undef
- if ($this->GetType == &ModDefs::MOD_REMOVE_ALBUMS or
- $this->GetType == &ModDefs::MOD_MERGE_ALBUM or
- $this->GetType == &ModDefs::MOD_MERGE_ALBUM_MAC or
- $this->GetType == &ModDefs::MOD_EDIT_ALBUM_LANGUAGE or
- $this->GetType == &ModDefs::MOD_EDIT_ALBUMATTRS);
+ if ($this->GetType == &ModDefs::MOD_REMOVE_RELEASES or
+ $this->GetType == &ModDefs::MOD_MERGE_RELEASE or
+ $this->GetType == &ModDefs::MOD_MERGE_RELEASE_MAC or
+ $this->GetType == &ModDefs::MOD_EDIT_RELEASE_LANGUAGE or
+ $this->GetType == &ModDefs::MOD_EDIT_RELEASE_ATTRS);
$mason->out(qq!<table class="edittype">!);
Deleted: mb_server/trunk/cgi-bin/MusicBrainz/Server/AlbumCDTOC.pm
Copied: mb_server/trunk/cgi-bin/MusicBrainz/Server/Alias.pm (from rev 9758, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Alias.pm)
Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/Annotation.pm
===================================================================
--- mb_server/trunk/cgi-bin/MusicBrainz/Server/Annotation.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MusicBrainz/Server/Annotation.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -34,12 +34,12 @@
{
our @EXPORT_OK = qw(
ARTIST_ANNOTATION
- ALBUM_ANNOTATION
+ RELEASE_ANNOTATION
LABEL_ANNOTATION
TRACK_ANNOTATION
);
our %EXPORT_TAGS = (
- type => [qw( ARTIST_ANNOTATION ALBUM_ANNOTATION LABEL_ANNOTATION TRACK_ANNOTATION )],
+ type => [qw( ARTIST_ANNOTATION RELEASE_ANNOTATION LABEL_ANNOTATION TRACK_ANNOTATION )],
);
}
@@ -52,7 +52,7 @@
use MusicBrainz::Server::Validation qw( encode_entities );
use constant ARTIST_ANNOTATION => 1;
-use constant ALBUM_ANNOTATION => 2;
+use constant RELEASE_ANNOTATION => 2;
use constant LABEL_ANNOTATION => 3;
use constant TRACK_ANNOTATION => 4;
@@ -94,7 +94,7 @@
return $_[0]->{rowid};
}
-sub GetAlbum
+sub GetRelease
{
return $_[0]->{rowid};
}
@@ -132,7 +132,7 @@
sub GetTypeWord
{
return "artist" if $_[0]{type} == ARTIST_ANNOTATION;
- return "album" if $_[0]{type} == ALBUM_ANNOTATION;
+ return "album" if $_[0]{type} == RELEASE_ANNOTATION;
return "label" if $_[0]{type} == LABEL_ANNOTATION;
return "track" if $_[0]{type} == TRACK_ANNOTATION;
die;
@@ -205,9 +205,9 @@
$_[0]->{changelog} = $_[1];
}
-sub SetAlbum
+sub SetRelease
{
- $_[0]->{type} = ALBUM_ANNOTATION;
+ $_[0]->{type} = RELEASE_ANNOTATION;
$_[0]->{rowid} = $_[1];
}
@@ -326,8 +326,8 @@
return 1;
}
-# Get the latest Annotation for the artist or album.
-# To make this work, SetArtist() or SetAlbum() have to be called
+# Get the latest Annotation for the artist or release.
+# To make this work, SetArtist() or SetRelease() have to be called
sub GetLatestAnnotation
{
@@ -375,7 +375,7 @@
return 1;
}
-# Insert an annotation. Moderator and album have to be set.
+# Insert an annotation. Moderator and release have to be set.
# If the text attribute is unset, an empty annotation is inserted.
sub Insert
@@ -409,9 +409,9 @@
# Returns a reference to an array of Annotation IDs for the specified
# object.
-sub GetAnnotationIDsForAlbum
+sub GetAnnotationIDsForRelease
{
- return $_[0]->GetAnnotationIDsForEntity($_[1], ALBUM_ANNOTATION);
+ return $_[0]->GetAnnotationIDsForEntity($_[1], RELEASE_ANNOTATION);
}
sub GetAnnotationIDsForArtist
@@ -506,10 +506,10 @@
$self->_Merge(LABEL_ANNOTATION, @_);
}
-sub MergeAlbums
+sub MergeReleases
{
my $self = shift;
- $self->_Merge(ALBUM_ANNOTATION, @_);
+ $self->_Merge(RELEASE_ANNOTATION, @_);
}
sub _Merge
@@ -584,7 +584,7 @@
changelog => "Result of artist merge",
notrans => 1
);
- } elsif ($type == ALBUM_ANNOTATION) {
+ } elsif ($type == RELEASE_ANNOTATION) {
my $artist_id = $opts{artistid} or die;
@@ -592,7 +592,7 @@
DBH => $self->{DBH},
uid => MODBOT_MODERATOR,
privs => UserStuff->AUTOMOD_FLAG,
- type => &ModDefs::MOD_ADD_ALBUM_ANNOTATION,
+ type => &ModDefs::MOD_ADD_RELEASE_ANNOTATION,
# --
artistid => $artist_id,
albumid => $new_id,
@@ -609,10 +609,10 @@
$self->_Delete(ARTIST_ANNOTATION, @_);
}
-sub DeleteAlbum
+sub DeleteRelease
{
my $self = shift;
- $self->_Delete(ALBUM_ANNOTATION, @_);
+ $self->_Delete(RELEASE_ANNOTATION, @_);
}
sub DeleteLabel
Copied: mb_server/trunk/cgi-bin/MusicBrainz/Server/Artist.pm (from rev 9758, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm)
Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/Attribute.pm
===================================================================
--- mb_server/trunk/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -30,9 +30,9 @@
use Carp qw( croak );
use base qw( TableBase );
-require Artist;
-require Album;
-require Track;
+require MusicBrainz::Server::Artist;
+require MusicBrainz::Server::Release;
+require MusicBrainz::Server::Track;
################################################################################
# Bare Constructor
Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/CDTOC.pm
===================================================================
--- mb_server/trunk/cgi-bin/MusicBrainz/Server/CDTOC.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MusicBrainz/Server/CDTOC.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -168,12 +168,12 @@
$rows;
}
-sub GetAlbumCDTOCs
+sub GetReleaseCDTOCs
{
my $self = shift;
$self = $self->new(shift) if not ref $self;
- require MusicBrainz::Server::AlbumCDTOC;
- MusicBrainz::Server::AlbumCDTOC->newFromCDTOC($self->{DBH}, $self, @_);
+ require MusicBrainz::Server::ReleaseCDTOC;
+ MusicBrainz::Server::ReleaseCDTOC->newFromCDTOC($self->{DBH}, $self, @_);
}
################################################################################
Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm
===================================================================
--- mb_server/trunk/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -217,8 +217,8 @@
$n = keys %trm;
$i = 0;
$t0 = [ gettimeofday ];
- require TRM;
- my $trmobj = TRM->new($dbh);
+ require MusicBrainz::Server::TRM;
+ my $trmobj = MusicBrainz::Server::TRM->new($dbh);
while (my ($trm, $usecount) = each %trm)
{
@@ -248,7 +248,7 @@
$n = keys %trmusage;
$i = 0;
$t0 = [ gettimeofday ];
- $trmobj = TRM->new($dbh);
+ $trmobj = MusicBrainz::Server::TRM->new($dbh);
while (my ($args, $usecount) = each %trmusage)
{
@@ -270,8 +270,8 @@
$i = 0;
$t0 = [ gettimeofday ];
- require Alias;
- my $aliasobj = Alias->new($dbh, "artistalias");
+ require MusicBrainz::Server::Alias;
+ my $aliasobj = MusicBrainz::Server::Alias->new($dbh, "artistalias");
while (my ($aliasid, $t) = each %artistalias)
{
Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm
===================================================================
--- mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm 2008-03-11 07:44:34 UTC (rev 9762)
+++ mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm 2008-03-11 11:32:23 UTC (rev 9763)
@@ -119,16 +119,16 @@
require MusicBrainz;
my $mb = MusicBrainz->new;
$mb->Login;
- require Artist;
+ require MusicBrainz::Server::Artist;
- $ar = Artist->new($mb->{DBH});
+ $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
$ar->SetMBId($mbid);
return undef unless $ar->LoadFromId(1);
if ($inc & INC_ALIASES)
{
- require Alias;
- my $alias = Alias->new($mb->{DBH}, "ArtistAlias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "ArtistAlias");
my @list = $alias->GetList($ar->GetId);
$info->{aliases} = \@list;
}
Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
=========