[mb-commits] r9775 - in mb_server/branches/ReleaseTrack/htdocs/edit: albumbatch track

[root at musicbrainz.org]

Author: luks
Date: 2008-03-16 16:04:20 +0000 (Sun, 16 Mar 2008)
New Revision: 9775

Modified:
   mb_server/branches/ReleaseTrack/htdocs/edit/albumbatch/merge.html
   mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html
Log:
A couple of fixes

Modified: mb_server/branches/ReleaseTrack/htdocs/edit/albumbatch/merge.html
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/edit/albumbatch/merge.html	2008-03-16 15:40:24 UTC (rev 9774)
+++ mb_server/branches/ReleaseTrack/htdocs/edit/albumbatch/merge.html	2008-03-16 16:04:20 UTC (rev 9775)
@@ -173,16 +173,16 @@
 <%perl>
 
 	my (%merged, @id_numtracks);
-	my ($id, $i, $release, @tracks, $track, @ids);
+	my ($id, $i, $release, $tracks, $release_track, @ids);
 
 	my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
 
 	foreach $release (@objs)
 	{
-		@tracks = $release->LoadTracks();
-		foreach $track (@tracks)
+		$tracks = $release->FindTracks();
+		foreach $release_track (@$tracks)
 		{
-			$merged{$track->GetSequence()}++;
+			$merged{$release_track->GetSequence()}++;
 		}
 
 		for (@{ $release->GetDiscIDs })

Modified: mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html	2008-03-16 15:40:24 UTC (rev 9774)
+++ mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html	2008-03-16 16:04:20 UTC (rev 9775)
@@ -77,12 +77,13 @@
 	my $artist = $m->comp("/comp/loadartist", $mb, $release->GetArtist);
 	$track = $m->comp("/comp/loadtrack", $mb, $trackid, $releaseid);
 
+
 	# Allow the track number to be set as high as either the highest track number,
 	# or the number of tracks on the release, whichever is the greater.
 	my $last_seq = 0;
-	if (my $tracks = $release->GetTracks)
+	if (my $tracks = $release->FindTracks)
 	{
-		my $track_cnt = $release->GetTrackCount;
+		my $track_cnt = scalar(@tracks);
 		$last_seq = (@$tracks ? $tracks->[-1]->GetSequence : 1);
 		$last_seq = $track_cnt if ($track_cnt > $last_seq);
 	}