[Slim-Checkins] r8795 - in /trunk/server: Changelog6.html Slim/Schema.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Fri Aug  4 11:10:26 2006
New Revision: 8795

URL: http://svn.slimdevices.com?rev=8795&view=rev
Log:
Bug: 3866
Description: Fix multi-disc album grouping when albums are split over sub dirs of an artist.

Modified:
    trunk/server/Changelog6.html
    trunk/server/Slim/Schema.pm

Modified: trunk/server/Changelog6.html
URL: http://svn.slimdevices.com/trunk/server/Changelog6.html?rev=8795&r1=8794&r2=8795&view=diff
==============================================================================
--- trunk/server/Changelog6.html (original)
+++ trunk/server/Changelog6.html Fri Aug  4 11:10:26 2006
@@ -463,6 +463,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3853">#3853</a> - playing genre favorite plays songs in track order</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3859">#3859</a> - genre favorites play via player, but not via web interface</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3861">#3861</a> - Search crashes slimserver</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3866">#3866</a> - Multidisc albums in different folders not recognized as same album</li>
 	</ul>
 </ul>
 

Modified: trunk/server/Slim/Schema.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema.pm?rev=8795&r1=8794&r2=8795&view=diff
==============================================================================
--- trunk/server/Slim/Schema.pm (original)
+++ trunk/server/Slim/Schema.pm Fri Aug  4 11:10:26 2006
@@ -1688,7 +1688,7 @@
 			};
 
 			# Join on tracks with the same basename to determine a unique album.
-			if (!defined $disc || !defined $discc) {
+			if (!defined $disc && !defined $discc) {
 
 				$search->{'tracks.url'} = { 'like' => "$basename%" };
 
@@ -1703,7 +1703,7 @@
 
 				while (my ($tag, $value) = each %{$search}) {
 
-					msg("--- $tag : $value\n") if defined $value;
+					msgf("--- $tag : %s\n", Data::Dump::dump($value));
 				}
 
 				if ($albumObj) {
@@ -1720,7 +1720,7 @@
 			# album object is valid.
 			if ($albumObj && $checkDisc && !defined $isCompilation) {
 
-				my $matchTrack = $albumObj->tracks({ 'tracknum' => $track->tracknum });
+				my $matchTrack = $albumObj->tracks({ 'tracknum' => $track->tracknum })->first;
 
 				if (defined $matchTrack && dirname($matchTrack->url) ne dirname($track->url)) {