librefm-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Librefm-commits] [1537] whitespace and indentation


From: Clint Adams
Subject: [Librefm-commits] [1537] whitespace and indentation
Date: Wed, 13 May 2009 21:10:01 +0000

Revision: 1537
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1537
Author:   clint
Date:     2009-05-13 21:10:01 +0000 (Wed, 13 May 2009)
Log Message:
-----------
whitespace and indentation

Modified Paths:
--------------
    trunk/gnukebox/musicbrainz.php
    trunk/gnukebox/submissions/1.2/index.php

Modified: trunk/gnukebox/musicbrainz.php
===================================================================
--- trunk/gnukebox/musicbrainz.php      2009-05-13 21:07:57 UTC (rev 1536)
+++ trunk/gnukebox/musicbrainz.php      2009-05-13 21:10:01 UTC (rev 1537)
@@ -66,35 +66,34 @@
 }
 
 function ScrobbleLookup($artist, $track){
+       global $adodb;
 
-                    global $adodb;
+       $sql = "SELECT album from scrobbles where artist = " . 
$adodb->qstr($artist) . " and track = " . $adodb->qstr($track) . " LIMIT 1;";
 
-                       $sql = "SELECT album from scrobbles where artist = " . 
$adodb->qstr($artist) . " and track = " . $adodb->qstr($track) . " LIMIT 1;";
+       $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
+       $album = $adodb->GetOne($sql);
 
-                       $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
-                       $album = $adodb->GetOne($sql);
+       if(!$album) {
+               die("sql error");
+       }
 
-                       if(!$album) {
-                            die("sql error");
-                        }
-
-                       return $album;
+       return $album;
 }
 
 function BrainzLookup($artist, $track){
 
-                    global $adodb;
+       global $adodb;
 
-                       $sql = "select a.name as artist,l.name as album, t.name 
as track,t.gid as mbid from brainz.track t left join brainz.artist a on 
t.artist=a.id left join brainz.albumjoin j on j.track=t.id left join 
brainz.album l on l.id=j.album  where lower(t.name)=" . 
$adodb->qstr(mb_strtolower($track, "UTF-8")) . " and lower(a.name)=" . 
$adodb->qstr(mb_strtolower($artist, "UTF-8")) . " LIMIT 1;";
+       $sql = "select a.name as artist,l.name as album, t.name as track,t.gid 
as mbid from brainz.track t left join brainz.artist a on t.artist=a.id left 
join brainz.albumjoin j on j.track=t.id left join brainz.album l on 
l.id=j.album  where lower(t.name)=" . $adodb->qstr(mb_strtolower($track, 
"UTF-8")) . " and lower(a.name)=" . $adodb->qstr(mb_strtolower($artist, 
"UTF-8")) . " LIMIT 1;";
 
-                       $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
-                       $albumData = $adodb->GetRow($sql);
+       $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
+       $albumData = $adodb->GetRow($sql);
 
-                       if(!$albumData)) {
-                            die("sql error");
-                        }
+       if(!$albumData)) {
+               die("sql error");
+       }
 
-                       return $albumData['album'];
+       return $albumData['album'];
 }
 ?>
                </ul>

Modified: trunk/gnukebox/submissions/1.2/index.php
===================================================================
--- trunk/gnukebox/submissions/1.2/index.php    2009-05-13 21:07:57 UTC (rev 
1536)
+++ trunk/gnukebox/submissions/1.2/index.php    2009-05-13 21:10:01 UTC (rev 
1537)
@@ -165,7 +165,7 @@
                catch (exception $e) {
                     die("FAILED " . $e->getMessage() . "\n");
                }
-               
+
        }
 
                // Destroy now_playing since it is almost certainly obsolescent





reply via email to

[Prev in Thread] Current Thread [Next in Thread]