[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1169] throw out newly-irrelevant rating checks
From: |
Clint Adams |
Subject: |
[Librefm-commits] [1169] throw out newly-irrelevant rating checks |
Date: |
Sun, 03 May 2009 22:08:06 +0000 |
Revision: 1169
http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1169
Author: clint
Date: 2009-05-03 22:08:05 +0000 (Sun, 03 May 2009)
Log Message:
-----------
throw out newly-irrelevant rating checks
Modified Paths:
--------------
trunk/nixtape/data/Album.php
trunk/nixtape/data/Artist.php
trunk/nixtape/data/Server.php
trunk/nixtape/data/Statistic.php
trunk/nixtape/data/TagCloud.php
trunk/nixtape/data/Track.php
trunk/nixtape/data/User.php
Modified: trunk/nixtape/data/Album.php
===================================================================
--- trunk/nixtape/data/Album.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/Album.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -74,7 +74,7 @@
function getPlayCount() {
global $mdb2;
- $res = $mdb2->query("SELECT COUNT(*) AS scrobbles FROM
Scrobbles JOIN Track ON Scrobbles.track = Track.name WHERE rating<>'S' AND
Scrobbles.artist = "
+ $res = $mdb2->query("SELECT COUNT(*) AS scrobbles FROM
Scrobbles JOIN Track ON Scrobbles.track = Track.name WHERE Scrobbles.artist = "
. $mdb2->quote($this->artist_name, 'text') . 'AND
Track.album ='
. $mdb2->quote($this->name, 'text'));
if(!$res->numRows()) {
Modified: trunk/nixtape/data/Artist.php
===================================================================
--- trunk/nixtape/data/Artist.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/Artist.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -109,7 +109,7 @@
*/
function getTopTracks($number) {
global $mdb2;
- $res = $mdb2->query("SELECT track, COUNT(track) AS freq,
COUNT(DISTINCT username) AS listeners FROM Scrobbles WHERE rating<>'S' AND "
+ $res = $mdb2->query("SELECT track, COUNT(track) AS freq,
COUNT(DISTINCT username) AS listeners FROM Scrobbles WHERE"
. " artist = " . $mdb2->quote($this->name, 'text')
. " GROUP BY track ORDER BY freq DESC LIMIT " .
$mdb2->quote($number, "integer"));
while($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
Modified: trunk/nixtape/data/Server.php
===================================================================
--- trunk/nixtape/data/Server.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/Server.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -70,8 +70,7 @@
ON lower(s.artist) = lower(t.artist)
AND lower(s.album) = lower(t.album)
AND lower(s.track) = lower(t.name)
- WHERE s.rating<>'S'
- AND lower(s.username) = " .
$mdb2->quote(strtolower($username), "text") . '
+ WHERE lower(s.username) = " .
$mdb2->quote(strtolower($username), "text") . '
ORDER BY
s.time DESC
LIMIT ' . $mdb2->quote($number, "integer"));
@@ -99,7 +98,6 @@
ON lower(s.artist) = lower(t.artist)
AND lower(s.album) = lower(t.album)
AND lower(s.track) = lower(t.name)
- WHERE s.rating<>'S'
ORDER BY
s.time DESC
LIMIT " . $mdb2->quote($number, "integer"));
@@ -155,7 +153,7 @@
static function getTopArtists($number=20) {
global $mdb2;
- $res = $mdb2->query("SELECT COUNT(artist) as c, artist FROM Scrobbles
WHERE rating<>'S' GROUP BY artist ORDER BY c DESC LIMIT 20");
+ $res = $mdb2->query("SELECT COUNT(artist) as c, artist FROM Scrobbles
GROUP BY artist ORDER BY c DESC LIMIT 20");
if(PEAR::isError($res)) {
return $res;
Modified: trunk/nixtape/data/Statistic.php
===================================================================
--- trunk/nixtape/data/Statistic.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/Statistic.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -45,8 +45,6 @@
} else {
$query .= (!is_null($constraint)) ? ' username = ' .
$mdb2->quote($constraint, 'text') : null;
}
- $query .= (!is_null($constraint) && ($table == "Scrobbles")) ? ' AND '
: null;
- $query .= ($table == "Scrobbles") ? " rating <> 'S' " : null;
$query .= " GROUP BY $field ORDER BY count DESC LIMIT $limit";
$res = $mdb2->query($query);
if (PEAR::isError($res)) {
@@ -83,8 +81,6 @@
$query .= (!is_null($constraint) || ($table == "Scrobbles")) ? ' WHERE
' : null;
$query .= (!is_null($constraint)) ? ' username = ' .
$mdb2->quote($constraint, 'text') : null;
- $query .= (!is_null($constraint) && ($table == "Scrobbles")) ? ' AND '
: null;
- $query .= ($table == "Scrobbles") ? " rating <> 'S' " : null;
$query .= " GROUP BY date ORDER BY date DESC LIMIT $limit";
$res = $mdb2->query($query);
if (PEAR::isError($res)) {
Modified: trunk/nixtape/data/TagCloud.php
===================================================================
--- trunk/nixtape/data/TagCloud.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/TagCloud.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -47,8 +47,6 @@
} else {
$query .= (!is_null($constraint)) ? ' username = ' .
$mdb2->quote($constraint, 'text') : null;
}
- $query .= (!is_null($constraint) && (($table == "Scrobbles") ||
($table == "Free_Scrobbles"))) ? ' AND ' : null;
- $query .= (($table == "Scrobbles") || ($table == "Free_Scrobbles")) ?
" rating <> 'S' " : null;
$query .= " GROUP BY $field ORDER BY count DESC LIMIT $limit";
$res = $mdb2->query($query);
if (PEAR::isError($res)) {
Modified: trunk/nixtape/data/Track.php
===================================================================
--- trunk/nixtape/data/Track.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/Track.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -116,7 +116,7 @@
private function _getPlayCountAndListenerCount() {
global $mdb2;
- $res = $mdb2->query("SELECT COUNT(track) AS freq,
COUNT(DISTINCT username) AS listeners FROM Scrobbles WHERE rating<>'S' AND "
+ $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")
. " GROUP BY track ORDER BY freq DESC");
Modified: trunk/nixtape/data/User.php
===================================================================
--- trunk/nixtape/data/User.php 2009-05-03 22:01:59 UTC (rev 1168)
+++ trunk/nixtape/data/User.php 2009-05-03 22:08:05 UTC (rev 1169)
@@ -213,7 +213,7 @@
function getTopTracks($number=20) {
global $mdb2;
- $res = $mdb2->query("SELECT COUNT(track) as c, artist, album,
track FROM Scrobbles WHERE rating<>'S' AND
username=".$mdb2->quote($this->name,"text")." GROUP BY artist,album,track ORDER
BY c DESC LIMIT $number");
+ $res = $mdb2->query("SELECT COUNT(track) as c, artist, album,
track FROM Scrobbles WHERE username = ".$mdb2->quote($this->name,"text")."
GROUP BY artist,album,track ORDER BY c DESC LIMIT $number");
if(PEAR::isError($res)) {
return $res;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Librefm-commits] [1169] throw out newly-irrelevant rating checks,
Clint Adams <=