[Slim-Checkins] r10765 - in /trunk/server/Slim: Control/Queries.pm Schema/ResultSet/Playlist.pm

[fred at svn.slimdevices.com]

Author: fred
Date: Mon Nov 27 01:26:42 2006
New Revision: 10765

URL: http://svn.slimdevices.com?rev=10765&view=rev
Log:
svn merge -r 10763

Modified:
    trunk/server/Slim/Control/Queries.pm
    trunk/server/Slim/Schema/ResultSet/Playlist.pm

Modified: trunk/server/Slim/Control/Queries.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Queries.pm?rev=10765&r1=10764&r2=10765&view=diff
==============================================================================
--- trunk/server/Slim/Control/Queries.pm (original)
+++ trunk/server/Slim/Control/Queries.pm Mon Nov 27 01:26:42 2006
@@ -1681,11 +1681,9 @@
 		$where->{'me.year'} = $year;
 	}
 
-	# we don't want client playlists
-	$where->{'me.content_type'} = { '!=' => 'cpl' };
-
-	# we don't want transporter sources...
-	$where->{'me.content_type'} = { '!=' => 'src' };
+	# we don't want client playlists (Now playing), transporter sources,
+	# or playlists.
+	$where->{'me.content_type'} = {'!=', ['cpl', 'src', 'ssp']};
 
 	# Manage joins
 	if (defined $genreID) {

Modified: trunk/server/Slim/Schema/ResultSet/Playlist.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/ResultSet/Playlist.pm?rev=10765&r1=10764&r2=10765&view=diff
==============================================================================
--- trunk/server/Slim/Schema/ResultSet/Playlist.pm (original)
+++ trunk/server/Slim/Schema/ResultSet/Playlist.pm Mon Nov 27 01:26:42 2006
@@ -107,7 +107,7 @@
 	};
 
 	if (defined $search) {
-		$find->{'titlesearch'} = $search;
+		$find->{'titlesearch'} = {'like' => $search};
 	}
 
 	# Add search criteria for playlists