[Librefm-commits] [1163] update scrobble-utils since lower() seems to be saner than strtolower()

[Clint Adams]

Revision: 1163
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1163
Author:   clint
Date:     2009-05-03 21:27:56 +0000 (Sun, 03 May 2009)
Log Message:
-----------
update scrobble-utils since lower() seems to be saner than strtolower()

Modified Paths:
--------------
    branches/stable/gnukebox/scrobble-utils.php

Modified: branches/stable/gnukebox/scrobble-utils.php
===================================================================
--- branches/stable/gnukebox/scrobble-utils.php 2009-05-03 20:51:23 UTC (rev 
1162)
+++ branches/stable/gnukebox/scrobble-utils.php 2009-05-03 21:27:56 UTC (rev 
1163)
@@ -34,7 +34,7 @@
        $res = $mdb2->query("SELECT username FROM Scrobble_Sessions WHERE 
sessionid = " . $mdb2->quote($session_id, "text")); // get the username from 
the table
 
        if(PEAR::isError($res)) {   
-               die("FAILED " . $res->getMessage() . "\n");
+               die("FAILED ufs " . $res->getMessage() . "\n");
                // die is there is an error, printing the error
        }
 
@@ -56,14 +56,14 @@
 
        $res = $mdb2->query("SELECT name FROM Artist WHERE name = " . 
($artist));
        if(PEAR::isError($res)) {
-               die("FAILED " . $res->getMessage() . "\n");
+               die("FAILED art " . $res->getMessage() . "\n");
        }
 
        if(!$res->numRows()) {
                // Artist doesn't exist, so we create them
                $res = $mdb2->query("INSERT INTO Artist (name) VALUES (" . 
($artist) . ")");
                if(PEAR::isError($res)) {
-                       die("FAILED " . $res->getMessage() . "\n");
+                       die("FAILED artc " . $res->getMessage() . "\n");
                }
        }
 }
@@ -73,7 +73,7 @@
 
        $res = $mdb2->query("SELECT name FROM Album WHERE name = " . ($album) . 
" AND artist_name = " . ($artist));
        if(PEAR::isError($res)) {
-               die("FAILED " . $res->getMessage() . "\n");
+               die("FAILED alb " . $res->getMessage() . "\n");
        }
 
        if(!$res->numRows()) {
@@ -92,7 +92,7 @@
          }
 
                if(PEAR::isError($res)) {
-                       die("FAILED " . $res->getMessage() . "\n");
+                       die("FAILED albc " . $res->getMessage() . "\n");
                }
        }
 }
@@ -109,18 +109,18 @@
        $res = $mdb2->query("SELECT id FROM Track WHERE lower(name) = lower(" . 
($track) . ") AND lower(artist) = lower(" . ($artist) . ") AND album IS NULL");
        }
        if(PEAR::isError($res)) {
-               die("FAILED " . $res->getMessage() . "\n");
+               die("FAILED trk " . $res->getMessage() . "\n");
        }
 
        if(!$res->numRows()) {
                // Create new track
-               $res = $mdb2->query("INSERT INTO Track (name, artist, album, 
mbid) VALUES ("
+               $res = $mdb2->exec("INSERT INTO Track (name, artist, album, 
mbid) VALUES ("
                        . ($track) . ", "
                        . ($artist) . ", "
                        . ($album) . ", "
                        . ($mbid) . ")");
                if(PEAR::isError($res)) {
-                       die("FAILED " . $res->getMessage() . "\n");
+                       die("FAILED trkc " . $res->getMessage() . "\n");
                }
                return getTrackCreateIfNew($artist, $album, $track, $mbid);
        } else {
@@ -131,21 +131,27 @@
 function getScrobbleTrackCreateIfNew($artist, $album, $track, $mbid, $tid) {
        global $mdb2;
 
-       $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)))));
+       $res = $mdb2->query("SELECT id FROM Scrobble_Track WHERE name = lower("
+               . ($track) . ") AND artist = lower(" . ($artist) . ") AND album 
"
+               . (($album == 'NULL') ? "IS NULL" : ("= lower(" . ($album) . 
")")) . " AND mbid "
+               . (($mbid == 'NULL') ? "IS NULL" : ("= lower(" . ($mbid) . 
")")));
        if(PEAR::isError($res)) {
-               die("FAILED " . $res->getMessage() . "\n");
+               die("FAILED st " . $res->getMessage() . "\n");
        }
 
        if(!$res->numRows()) {
-               // Create new track
-               $res = $mdb2->exec("INSERT INTO Scrobble_Track (name, artist, 
album, mbid, track) VALUES ("
-                       . strtolower($track) . ", "
-                       . strtolower($artist) . ", "
-                       . strtolower($album) . ", "
-                       . strtolower($mbid) . ","
-                       . strtolower($tid) . ")");
+               $sql = "INSERT INTO Scrobble_Track (name, artist, album, mbid, 
track) VALUES ("
+                       . "lower(" . ($track) . "), "
+                       . "lower(" . ($artist) . "), "
+                       . (($album == 'NULL') ? "NULL" : "lower(" . ($album)) . 
"), "
+                       . (($mbid == 'NULL') ? "NULL" : "lower(" . ($mbid)) . 
"), "
+                       . ($tid) . ")";
+               $res = $mdb2->exec($sql);
                if(PEAR::isError($res)) {
-                       die("FAILED " . $res->getMessage() . "\n");
+                       $msg = $res->getMessage() . " - " . $res->getUserInfo();
+                       reportError($msg, $sql);
+
+                       die("FAILED stc " . $res->getMessage() . "\n");
                }
                return getScrobbleTrackCreateIfNew($artist, $album, $track, 
$mbid, $tid);
        } else {
@@ -158,7 +164,7 @@
 
        $res = $mdb2->query("SELECT time FROM Scrobbles WHERE username = " . 
($username) . " AND artist = " . ($artist) . " AND track = " . ($track) . " AND 
time = " . ($time));
        if(PEAR::isError($res)) {
-               die("FAILED " . $res->getMessage() . "\n");
+               die("FAILED se " . $res->getMessage() . "\n");
        }
 
        if(!$res->numRows()) {