[mb-commits] r9737 - in mb_server/branches/terminology: cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 htdocs/bare htdocs/show/cdtoc

[root at musicbrainz.org]

Author: luks
Date: 2008-03-09 13:49:33 +0000 (Sun, 09 Mar 2008)
New Revision: 9737

Modified:
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm
   mb_server/branches/terminology/htdocs/bare/cdlookup.html
   mb_server/branches/terminology/htdocs/bare/xget.html
   mb_server/branches/terminology/htdocs/show/cdtoc/index.html
Log:
Fix all references to "Album" in the public API of MusicBrainz::Server::ReleaseCDTOC

Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm	2008-03-09 13:37:29 UTC (rev 9736)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Release.pm	2008-03-09 13:49:33 UTC (rev 9737)
@@ -164,7 +164,7 @@
         $inc = INC_ARTIST | INC_COUNTS | INC_RELEASEINFO;
 
         my $cd = MusicBrainz::Server::ReleaseCDTOC->new($mb->{DBH});
-        my $albumids = $cd->GetAlbumIDsFromDiscID($cdid);
+        my $albumids = $cd->GetReleaseIDsFromDiscID($cdid);
         if (scalar(@$albumids))
         {
             foreach my $id (@$albumids)

Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm	2008-03-09 13:37:29 UTC (rev 9736)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/ReleaseCDTOC.pm	2008-03-09 13:49:33 UTC (rev 9737)
@@ -42,7 +42,7 @@
 ################################################################################
 
 # GetId / SetId - see TableBase
-sub GetAlbumId	{ $_[0]{album} }
+sub GetReleaseId	{ $_[0]{album} }
 sub GetCDTOCId	{ $_[0]{cdtoc} }
 # GetModPending / SetModPending - see TableBase
 
@@ -50,7 +50,7 @@
 # Derived Properties
 ################################################################################
 
-sub GetAlbum	{ $_[0]{_album} ||= $_[0]->_GetAlbum }
+sub GetRelease	{ $_[0]{_album} ||= $_[0]->_GetRelease }
 sub GetCDTOC	{ $_[0]{_cdtoc} ||= $_[0]->_GetCDTOC }
 
 sub _GetCDTOC
@@ -64,18 +64,18 @@
 	$cdtoc;
 }
 
-sub _GetAlbum
+sub _GetRelease
 {
 	my $self = shift;
-	my $id = $self->GetAlbumId;
+	my $id = $self->GetReleaseId;
 
 	require MusicBrainz::Server::Release;
-	my $album = MusicBrainz::Server::Release->new($self->{DBH});
-	$album->SetId($id);
-	$album->LoadFromId
-		and return $album;
+	my $release = MusicBrainz::Server::Release->new($self->{DBH});
+	$release->SetId($id);
+	$release->LoadFromId
+		and return $release;
 
-	warn "Failed to fetch album #$id";
+	warn "Failed to fetch release #$id";
 	undef;
 }
 
@@ -249,10 +249,10 @@
 
 # Given a discid / freedbid, get a list of matching album IDs
 
-sub GetAlbumIDsFromDiscID { my $self = shift; $self->_GetAlbumIDsFromHash("discid", @_) }
-sub GetAlbumIDsFromFreeDBID { my $self = shift; $self->_GetAlbumIDsFromHash("freedbid", @_) }
+sub GetReleaseIDsFromDiscID { my $self = shift; $self->_GetReleaseIDsFromHash("discid", @_) }
+sub GetReleaseIDsFromFreeDBID { my $self = shift; $self->_GetReleaseIDsFromHash("freedbid", @_) }
 
-sub _GetAlbumIDsFromHash
+sub _GetReleaseIDsFromHash
 {
 	my $self = shift;
 	my $type = shift;
@@ -310,7 +310,7 @@
 	}
 
 	# Check to see if the album is in the main database
-	my $albumids = $self->GetAlbumIDsFromDiscID($discid);
+	my $albumids = $self->GetReleaseIDsFromDiscID($discid);
 
 	if (@$albumids)
 	{

Modified: mb_server/branches/terminology/htdocs/bare/cdlookup.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/cdlookup.html	2008-03-09 13:37:29 UTC (rev 9736)
+++ mb_server/branches/terminology/htdocs/bare/cdlookup.html	2008-03-09 13:49:33 UTC (rev 9737)
@@ -89,9 +89,9 @@
 		my $alcdtoc = MusicBrainz::Server::ReleaseCDTOC->new($mb->{DBH});
 		my $releaseids = (
 			$discid
-				? $alcdtoc->GetAlbumIDsFromDiscID($discid)
+				? $alcdtoc->GetReleaseIDsFromDiscID($discid)
 				: $freedbid
-					? $alcdtoc->GetAlbumIDsFromFreeDBID($freedbid)
+					? $alcdtoc->GetReleaseIDsFromFreeDBID($freedbid)
 					: []);
 
 		# No matches, and we cant add the release since we have no toc,
@@ -176,8 +176,8 @@
 
 			if ($cdtoc)
 			{
-				my $alcdtocs = $cdtoc->GetReleaseCDTOCs;
-				$releaseids = [ map { $_->GetAlbumId } @$alcdtocs ];
+				my $relcdtocs = $cdtoc->GetReleaseCDTOCs;
+				$releaseids = [ map { $_->GetReleaseId } @$relcdtocs ];
 			}
 		}
 

Modified: mb_server/branches/terminology/htdocs/bare/xget.html
===================================================================
--- mb_server/branches/terminology/htdocs/bare/xget.html	2008-03-09 13:37:29 UTC (rev 9736)
+++ mb_server/branches/terminology/htdocs/bare/xget.html	2008-03-09 13:49:33 UTC (rev 9737)
@@ -55,7 +55,7 @@
 		$release = MusicBrainz::Server::Release->new($mb->{DBH});
 			$di = MusicBrainz::Server::ReleaseCDTOC->new($mb->{DBH});
 
-		my $releaseids = $di->GetAlbumIDsFromDiscID($discid);
+		my $releaseids = $di->GetReleaseIDsFromDiscID($discid);
 		if (not @$releaseids)
 		{
 			return "<CDInfo />";

Modified: mb_server/branches/terminology/htdocs/show/cdtoc/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/cdtoc/index.html	2008-03-09 13:37:29 UTC (rev 9736)
+++ mb_server/branches/terminology/htdocs/show/cdtoc/index.html	2008-03-09 13:49:33 UTC (rev 9737)
@@ -61,7 +61,7 @@
 
 %		for my $alcdtoc (@$alcdtocs)
 %		{
-%			my $release = $alcdtoc->GetAlbum;
+%			my $release = $alcdtoc->GetRelease;
 %           my $artist = $m->comp("/comp/loadartist", $mb, $release->GetArtist);
 			<& /comp/album, album => $release, artist => $artist, showmodlinks => 0, showlinks => 0  &>
             <p style="text-align: center"><a href="/edit/album/setdurations.html?cdtocid=<% $cdtocid %>&releaseid=<% $release->GetId %>">Set track durations for the above release based on this CD TOC</a></p>