From 747147cd98db4403eaad91d89051353b289b36c8 Mon Sep 17 00:00:00 2001 From: clint <> Date: Sat, 2 May 2009 03:25:23 +0000 Subject: [PATCH] these are being set to the string 'NULL' --- gnukebox/scrobble-utils.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnukebox/scrobble-utils.php b/gnukebox/scrobble-utils.php index 29adf76c..78dd3e34 100644 --- a/gnukebox/scrobble-utils.php +++ b/gnukebox/scrobble-utils.php @@ -131,10 +131,7 @@ function getTrackCreateIfNew($artist, $album, $track, $mbid) { function getScrobbleTrackCreateIfNew($artist, $album, $track, $mbid, $tid) { global $mdb2; - if($album) { $album = strtolower($album); } - if($mbid) { $mbid = strtolower($mbid); } - - $res = $mdb2->query("SELECT id FROM Scrobble_Track WHERE name = " . (strtolower($track)) . " AND artist = " . (strtolower($artist)) . " AND album = " . ($album) . " AND mbid = " . ($mbid)); + $res = $mdb2->query("SELECT id FROM Scrobble_Track WHERE name = " . (strtolower($track)) . " AND artist = " . (strtolower($artist)) . " AND album " . ($album == 'NULL') ? "IS NULL" : ("= " . (strtolower($album))) . " AND mbid " . ($mbid == 'NULL') ? "IS NULL" : ("= " . (strtolower($mbid)))); if(PEAR::isError($res)) { die("FAILED " . $res->getMessage() . "\n"); } -- GitLab