librefm-commits
[Top][All Lists]
Advanced

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

[Librefm-commits] [1507] convert data/Track.php to adodb


From: Clint Adams
Subject: [Librefm-commits] [1507] convert data/Track.php to adodb
Date: Tue, 12 May 2009 01:28:58 +0000

Revision: 1507
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1507
Author:   clint
Date:     2009-05-12 01:28:57 +0000 (Tue, 12 May 2009)
Log Message:
-----------
convert data/Track.php to adodb

Modified Paths:
--------------
    trunk/nixtape/data/Track.php

Modified: trunk/nixtape/data/Track.php
===================================================================
--- trunk/nixtape/data/Track.php        2009-05-12 01:21:00 UTC (rev 1506)
+++ trunk/nixtape/data/Track.php        2009-05-12 01:28:57 UTC (rev 1507)
@@ -20,7 +20,7 @@
 */
 
 
-require_once($install_path . '/database.php');
+require_once($install_path . '/database2.php');
 require_once($install_path . '/data/Artist.php');
 require_once($install_path . '/data/Album.php');
 require_once($install_path . '/data/Server.php');
@@ -47,14 +47,15 @@
         * @param string $artist The name of the artist who recorded this track
         */
        function __construct($name, $artist) {
-               global $mdb2;
-               $res = $mdb2->query('SELECT name, artist_name, album_name, 
duration, streamable, license, downloadurl, streamurl, mbid FROM Track WHERE '
-                       . 'name = ' . $mdb2->quote($name, 'text') . ' AND '
-                       . 'artist_name = ' . $mdb2->quote($artist, 'text'));
-               if(!$res->numRows()) {
+               global $adodb;
+               $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
+               $res = $adodb->CacheGetRow(600, 'SELECT name, artist_name, 
album_name, duration, streamable, license, downloadurl, streamurl, mbid FROM 
Track WHERE '
+                       . 'name = ' . $adodb->qstr($name) . ' AND '
+                       . 'artist_name = ' . $adodb->qstr($artist);
+               if(!$res) {
                        $this->name = 'No such track: ' . $name;
                } else {
-                       $row = sanitize($res->fetchRow(MDB2_FETCHMODE_ASSOC));
+                       $row = $res;
                        $this->name = $row['name'];
                        $this->mbid = $row['mbid'];
                        $this->artist_name = $row['artist_name'];
@@ -118,14 +119,14 @@
 
 
        private function _getPlayCountAndListenerCount() {
-               global $mdb2;
+               global $adodb;
 
-               $res = $mdb2->query('SELECT COUNT(track) AS freq, 
COUNT(DISTINCT username) AS listeners FROM Scrobbles WHERE'
-                       . ' artist = ' . $mdb2->quote($this->artist_name, 
'text') 
-                       . ' AND track = ' . $mdb2->quote($this->name, 'text')
+               $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
+               $row = $adodb->CacheGetRow(300, 'SELECT COUNT(track) AS freq, 
COUNT(DISTINCT username) AS listeners FROM Scrobbles WHERE'
+                       . ' artist = ' . $adodb->qstr($this->artist_name)
+                       . ' AND track = ' . $adodb->qstr($this->name)
                        . ' GROUP BY track ORDER BY freq DESC');
 
-               $row = $res->fetchRow(MDB2_FETCHMODE_ASSOC);
                if (!isset($row)) {
                        $this->setPlaycount(0);
                        $this->setListenerCount(0);





reply via email to

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