[mb-commits] r9728 - in mb_server/branches/terminology: admin cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/moderation htdocs/comp/release htdocs/comp/release_editor htdocs/edit/albumreleases

root at musicbrainz.org root at musicbrainz.org
Sun Mar 9 09:25:41 UTC 2008


Author: luks
Date: 2008-03-09 09:25:41 +0000 (Sun, 09 Mar 2008)
New Revision: 9728

Added:
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm
Removed:
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
Modified:
   mb_server/branches/terminology/admin/startup.pl.default
   mb_server/branches/terminology/cgi-bin/Album.pm
   mb_server/branches/terminology/cgi-bin/Insert.pm
   mb_server/branches/terminology/cgi-bin/MM_2_1.pm
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm
   mb_server/branches/terminology/cgi-bin/QuerySupport.pm
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS
   mb_server/branches/terminology/htdocs/comp/release/release_end
   mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
   mb_server/branches/terminology/htdocs/comp/release_editor/form-releases
   mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
   mb_server/branches/terminology/htdocs/comp/release_editor/review
   mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html
   mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html
   mb_server/branches/terminology/htdocs/edit/albumreleases/index.html
   mb_server/branches/terminology/htdocs/edit/albumreleases/review.html
Log:
Rename MusicBrainz::Server::Release to MusicBrainz::Server::ReleaseEvent

Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/admin/startup.pl.default	2008-03-09 09:25:41 UTC (rev 9728)
@@ -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;

Modified: mb_server/branches/terminology/cgi-bin/Album.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Album.pm	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/cgi-bin/Album.pm	2008-03-09 09:25:41 UTC (rev 9728)
@@ -475,8 +475,8 @@
 	MusicBrainz::Server::AlbumCDTOC->RemoveAlbum($this->{DBH}, $album);
 
     print STDERR "DELETE: Removed release where album was " . $album . "\n";
-	require MusicBrainz::Server::Release;
-	my $rel = MusicBrainz::Server::Release->new($sql->{DBH});
+	require MusicBrainz::Server::ReleaseEvent;
+	my $rel = MusicBrainz::Server::ReleaseEvent->new($sql->{DBH});
 	$rel->RemoveByAlbum($album);
 
     if ($sql->Select(qq|select AlbumJoin.track from AlbumJoin 
@@ -822,11 +822,11 @@
 
 
 # Find all releases for this album.  Returns a list of M::S::Release objects.
-sub Releases
+sub ReleaseEvents
 {
 	my ($self, $loadlabels) = @_;
-	require MusicBrainz::Server::Release;
-	my $rel = MusicBrainz::Server::Release->new($self->{DBH});
+	require MusicBrainz::Server::ReleaseEvent;
+	my $rel = MusicBrainz::Server::ReleaseEvent->new($self->{DBH});
 	$rel->newFromAlbum($self->GetId, $loadlabels);
 }
 
@@ -1070,8 +1070,8 @@
 		MusicBrainz::Server::AlbumCDTOC->MergeAlbums($this->{DBH}, $id, $this->GetId);
 
 		# And the releases
-		require MusicBrainz::Server::Release;
-		my $rel = MusicBrainz::Server::Release->new($sql->{DBH});
+		require MusicBrainz::Server::ReleaseEvent;
+		my $rel = MusicBrainz::Server::ReleaseEvent->new($sql->{DBH});
 		$rel->MoveFromAlbumToAlbum($id, $this->GetId);
 
 		# And the annotations

Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm	2008-03-09 09:25:41 UTC (rev 9728)
@@ -218,8 +218,8 @@
     my $trm = TRM->new($this->{DBH});
 	require PUID;
     my $puid = PUID->new($this->{DBH});
-	require MusicBrainz::Server::Release;
-	my $rel = MusicBrainz::Server::Release->new($this->{DBH});
+	require MusicBrainz::Server::ReleaseEvent;
+	my $rel = MusicBrainz::Server::ReleaseEvent->new($this->{DBH});
 
 	my $artist;
 	my $artistid;

Modified: mb_server/branches/terminology/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_1.pm	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/cgi-bin/MM_2_1.pm	2008-03-09 09:25:41 UTC (rev 9728)
@@ -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;

Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm	2008-03-09 09:25:41 UTC (rev 9728)
@@ -144,21 +144,21 @@
 
 my %formatNames = 
 (
-    MusicBrainz::Server::Release::RELEASE_FORMAT_CD           => 'CD',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_DVD          => 'DVD',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_SACD         => 'SACD',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_DUALDISC     => 'DualDisc',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_LASERDISC    => 'LaserDisc',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_MINIDISC     => 'MiniDisc',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_VINYL        => 'Vinyl',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_CASSETTE     => 'Cassette',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_CARTRIDGE    => 'Cartridge',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_REEL_TO_REEL => 'ReelToReel',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_DAT          => 'DAT',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_DIGITAL      => 'Digital',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_OTHER        => 'Other'     ,
-    MusicBrainz::Server::Release::RELEASE_FORMAT_WAX_CYLINDER => 'WaxCylinder',
-    MusicBrainz::Server::Release::RELEASE_FORMAT_PIANO_ROLL   => 'PianoRoll',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_CD           => 'CD',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_DVD          => 'DVD',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_SACD         => 'SACD',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_DUALDISC     => 'DualDisc',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_LASERDISC    => 'LaserDisc',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_MINIDISC     => 'MiniDisc',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_VINYL        => 'Vinyl',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_CASSETTE     => 'Cassette',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_CARTRIDGE    => 'Cartridge',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_REEL_TO_REEL => 'ReelToReel',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_DAT          => 'DAT',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_DIGITAL      => 'Digital',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_OTHER        => 'Other'     ,
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_WAX_CYLINDER => 'WaxCylinder',
+    MusicBrainz::Server::ReleaseEvent::RELEASE_FORMAT_PIANO_ROLL   => 'PianoRoll',
 );
 
 # Convert the passed inc argument into a bitflag with the given constants form above
@@ -433,7 +433,7 @@
     require MusicBrainz::Server::Country;
 
 	my ($al, $inc) = @_;
-    my (@releases) = $al->Releases(($inc & INC_LABELS) ? 1 : 0);
+    my (@releases) = $al->ReleaseEvents(($inc & INC_LABELS) ? 1 : 0);
     my $country_obj = MusicBrainz::Server::Country->new($al->{DBH})
        if @releases;
 	

Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASES.pm	2008-03-09 09:25:41 UTC (rev 9728)
@@ -252,8 +252,8 @@
 sub AdjustModPending
 {
 	my ($self, $adjust) = @_;
-	require MusicBrainz::Server::Release;
-	my $rel = MusicBrainz::Server::Release->new($self->{DBH});
+	require MusicBrainz::Server::ReleaseEvent;
+	my $rel = MusicBrainz::Server::ReleaseEvent->new($self->{DBH});
 
 	for my $list (qw( adds edits removes ))
 	{
@@ -268,8 +268,8 @@
 sub ApprovedAction
 {
 	my $self = shift;
-	require MusicBrainz::Server::Release;
-	my $release = MusicBrainz::Server::Release->new($self->{DBH});
+	require MusicBrainz::Server::ReleaseEvent;
+	my $release = MusicBrainz::Server::ReleaseEvent->new($self->{DBH});
 
 	require MusicBrainz::Server::Country;
 	my $country = MusicBrainz::Server::Country->new($self->{DBH});
@@ -346,8 +346,8 @@
 sub DeniedAction
 {
 	my $self = shift;
-	require MusicBrainz::Server::Release;
-	my $release = MusicBrainz::Server::Release->new($self->{DBH});
+	require MusicBrainz::Server::ReleaseEvent;
+	my $release = MusicBrainz::Server::ReleaseEvent->new($self->{DBH});
 
 	# Remove the "adds" list
 	for my $t (@{ $self->{"adds"} })

Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm

Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseEvent.pm (from rev 9727, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm)

Modified: mb_server/branches/terminology/cgi-bin/QuerySupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/QuerySupport.pm	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm	2008-03-09 09:25:41 UTC (rev 9728)
@@ -1166,7 +1166,7 @@
    }
 
    my (@releases, $releasedate);
-   @releases = $album->Releases;
+   @releases = $album->ReleaseEvents;
    if (@releases)
    {
        require MusicBrainz::Server::Country;

Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASEEVENTS	2008-03-09 09:25:41 UTC (rev 9728)
@@ -76,7 +76,7 @@
 %				}
 %				if ($t->{"f"})
 %				{
-					- Format: <% MusicBrainz::Server::Release::GetReleaseFormatName($t->{"f"}) %>
+					- Format: <% MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($t->{"f"}) %>
 %				}
 			</td>
 		</tr>

Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASEEVENTS	2008-03-09 09:25:41 UTC (rev 9728)
@@ -77,7 +77,7 @@
 %				}
 %				if ($t->{"f"})
 %				{
-					- Format: <% MusicBrainz::Server::Release::GetReleaseFormatName($t->{"f"}) %>
+					- Format: <% MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($t->{"f"}) %>
 %				}
 			</td>
 		</tr>
@@ -102,7 +102,7 @@
 %				}
 %				if ($t->{"nf"})
 %				{
-					- Format: <% MusicBrainz::Server::Release::GetReleaseFormatName($t->{"nf"}) %>
+					- Format: <% MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($t->{"nf"}) %>
 %				}
 			</td>
 		</tr>

Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASEEVENTS	2008-03-09 09:25:41 UTC (rev 9728)
@@ -76,7 +76,7 @@
 %				}
 %				if ($t->{"f"})
 %				{
-					- Format: <% MusicBrainz::Server::Release::GetReleaseFormatName($t->{"f"}) %>
+					- Format: <% MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($t->{"f"}) %>
 %				}
 			</td>
 		</tr>

Modified: mb_server/branches/terminology/htdocs/comp/release/release_end
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release/release_end	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/release/release_end	2008-03-09 09:25:41 UTC (rev 9728)
@@ -113,7 +113,7 @@
 		<tr valign="top">
 			<td class="eventslist">
 
-%		my @relevents = $releaseevents ? @$releaseevents : $release->Releases(1);
+%		my @relevents = $releaseevents ? @$releaseevents : $release->ReleaseEvents(1);
 %		if (@relevents == 0)
 %		{
 

Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit	2008-03-09 09:25:41 UTC (rev 9728)
@@ -182,7 +182,7 @@
 			# MOD_EDIT_RELEASES (RELEASE_EVENTS)
 			# get all defined release events from the arguments hash
 			# and fill the list of new release objects
-			require MusicBrainz::Server::Release;
+			require MusicBrainz::Server::ReleaseEvent;
 			my @revnew;
 			my (@adds, @edits, @removes);
 			for my $j (sort map { /^rev_year-(\d+)$/ ? ($1) : () } keys %ARGS)
@@ -224,7 +224,7 @@
 								0, 1,
 							);
 
-						my $rev = MusicBrainz::Server::Release->new($mb->{DBH});
+						my $rev = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 						$rev->SetId($rev_id);
 						$rev->SetCountry($rev_country);
 						$rev->SetYMD(@ymd);
@@ -239,7 +239,7 @@
 			}
 
 			# get all defined release events.
-			my @relEvents = $release->Releases;
+			my @relEvents = $release->ReleaseEvents;
 			my %revorig;
 			for my $i (0 .. @relEvents-1)
 			{

Modified: mb_server/branches/terminology/htdocs/comp/release_editor/form-releases
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/form-releases	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/form-releases	2008-03-09 09:25:41 UTC (rev 9728)
@@ -84,7 +84,7 @@
 <%perl>
 	my $countries_menu = $m->comp("/edit/albumreleases/countries-menu.inc");
 	my $countries_menu_2 = [ [ "", "Select country..." ], @$countries_menu ];
-	my $formats_menu = MusicBrainz::Server::Release::GetReleaseFormats();
+	my $formats_menu = MusicBrainz::Server::ReleaseEvent::GetReleaseFormats();
 
 	for ($j=0; $j < $num_releases; ++$j)
 	{

Modified: mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/init-editall	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/init-editall	2008-03-09 09:25:41 UTC (rev 9728)
@@ -120,7 +120,7 @@
 	$orig{"v::edit_track_data"} = ($release->CanAddTrack or $release->CanRemoveTrack);
 
 	# load releases, and add into @t list.
-	my @releaseEvents = $release->Releases(1);
+	my @releaseEvents = $release->ReleaseEvents(1);
 	for $i (0 .. @releaseEvents-1)
 	{
 		my $rev = $releaseEvents[$i];

Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review	2008-03-09 09:25:41 UTC (rev 9728)
@@ -100,7 +100,7 @@
 	# MOD_EDIT_RELEASES (RELEASE_EVENTS)
 	# get all defined release events from the arguments hash
 	# and fill the list of new release objects
-	require MusicBrainz::Server::Release;
+	require MusicBrainz::Server::ReleaseEvent;
 	my @revnew;
 	my %revorighash;
 	my %revremovehash;
@@ -146,7 +146,7 @@
 						0, 1,
 					);
 
-				my $rev = MusicBrainz::Server::Release->new($mb->{DBH});
+				my $rev = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 				$rev->SetId($rev_id);
 				$rev->SetCountry($rev_country);
 				$rev->SetYMD(@ymd);
@@ -172,7 +172,7 @@
 		my @ymd = MusicBrainz::Server::Validation::IsValidDate($rev_year, $rev_month, $rev_day)
 			or next;
 
-		my $rev = MusicBrainz::Server::Release->new($mb->{DBH});
+		my $rev = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 		$rev->SetCountry($orig{"rev_country-$j"});
 		$rev->SetYMD(@ymd);
 		$rev->SetCatNo($orig{"rev_catno-$j"});

Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/editreleases.html	2008-03-09 09:25:41 UTC (rev 9728)
@@ -48,7 +48,7 @@
 
 	my $countries_menu = $m->comp("countries-menu.inc");
 	my $countries_menu_2 = [ [ "", "[select a country]" ], @$countries_menu ];
-	my $formats_menu = MusicBrainz::Server::Release::GetReleaseFormats();
+	my $formats_menu = MusicBrainz::Server::ReleaseEvent::GetReleaseFormats();
     my $error;
 
 	# Update releases

Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/enter.html	2008-03-09 09:25:41 UTC (rev 9728)
@@ -58,7 +58,7 @@
 	my (@adds, @edits, @removes);
 	for my $rel (@{ $edit->{"releases"} })
 	{
-		my $revnew = MusicBrainz::Server::Release->new($mb->{DBH});
+		my $revnew = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 		$revnew->SetAlbum($release->GetId);
 		$revnew->SetCountry($rel->{"country"});
 		$revnew->SetYMD(@$rel{qw( year month day )});
@@ -77,7 +77,7 @@
 			next;
 		}
 
-		my $revold = MusicBrainz::Server::Release->new($mb->{DBH});
+		my $revold = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 		$revold = $revold->newFromId($rel->{"id"})
 			or next;
 

Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/index.html	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/index.html	2008-03-09 09:25:41 UTC (rev 9728)
@@ -60,7 +60,7 @@
 	my $artist = $m->comp("/comp/loadartist", $mb, $release->GetArtist);
 
 	# fill the release events into the "r" list.
-	my @r = $release->Releases(1);
+	my @r = $release->ReleaseEvents(1);
 	@r = map {
 		my @ymd = $_->GetYMD;
 		+{

Modified: mb_server/branches/terminology/htdocs/edit/albumreleases/review.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumreleases/review.html	2008-03-09 09:09:21 UTC (rev 9727)
+++ mb_server/branches/terminology/htdocs/edit/albumreleases/review.html	2008-03-09 09:25:41 UTC (rev 9728)
@@ -138,7 +138,7 @@
 						<strong>Barcode:</strong> <% $rel->{orig_barcode} || "?" %> -
 						<strong>Format:</strong> <%
 							$rel->{orig_format}
-								? MusicBrainz::Server::Release::GetReleaseFormatName($rel->{orig_format})
+								? MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($rel->{orig_format})
 								: "?" %>
 					</td>
 				</tr>
@@ -172,14 +172,14 @@
 						<strong>Barcode:</strong> <% $rel->{barcode} || "?" %> -
 						<strong>Format:</strong> <%
 							$rel->{format}
-								? MusicBrainz::Server::Release::GetReleaseFormatName($rel->{format})
+								? MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($rel->{format})
 								: "?" %>
 					</td>
 				</tr>
 			<%perl>
 			++$changes;
 
-			my $rev = MusicBrainz::Server::Release->new($mb->{DBH});
+			my $rev = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 			$rev->SetCountry($rel->{country});
 			$rev->SetYMD(@$rel{qw( year month day )});
 			$rev->SetLabel($rel->{label});
@@ -192,7 +192,7 @@
 			next;
 		}
 
-		my $rev = MusicBrainz::Server::Release->new($mb->{DBH});
+		my $rev = MusicBrainz::Server::ReleaseEvent->new($mb->{DBH});
 		$rev->SetCountry($rel->{country});
 		$rev->SetYMD(@$rel{qw( year month day )});
 		$rev->SetLabel($rel->{label});
@@ -238,7 +238,7 @@
 						<strong>Barcode:</strong> <% $rel->{orig_barcode} || "?" %> -
 						<strong>Format:</strong> <%
 							$rel->{orig_format}
-								? MusicBrainz::Server::Release::GetReleaseFormatName($rel->{orig_format})
+								? MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($rel->{orig_format})
 								: "?" %>
 						
 						<br/>
@@ -260,7 +260,7 @@
 						<strong>Barcode:</strong> <% $rel->{barcode} || "?" %> -
 						<strong>Format:</strong> <%
 							$rel->{format}
-								? MusicBrainz::Server::Release::GetReleaseFormatName($rel->{format})
+								? MusicBrainz::Server::ReleaseEvent::GetReleaseFormatName($rel->{format})
 								: "?" %>
 					</td>
 				</tr>




More information about the MusicBrainz-commits mailing list