[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1086] give free tracks precedence in Now_Playing list
From: |
Clint Adams |
Subject: |
[Librefm-commits] [1086] give free tracks precedence in Now_Playing list |
Date: |
Thu, 30 Apr 2009 22:04:55 +0000 |
Revision: 1086
http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1086
Author: clint
Date: 2009-04-30 22:04:54 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
give free tracks precedence in Now_Playing list
Modified Paths:
--------------
trunk/gnukebox/install.php
trunk/nixtape/data/Server.php
Modified: trunk/gnukebox/install.php
===================================================================
--- trunk/gnukebox/install.php 2009-04-30 21:58:46 UTC (rev 1085)
+++ trunk/gnukebox/install.php 2009-04-30 22:04:54 UTC (rev 1086)
@@ -137,7 +137,7 @@
album VARCHAR(255),
mbid VARCHAR(36),
duration INTEGER,
- streamable INTEGER,
+ streamable INTEGER DEFAULT 0,
license VARCHAR(255),
downloadurl VARCHAR(255),
streamurl VARCHAR(255),
@@ -151,7 +151,7 @@
album VARCHAR(255),
mbid VARCHAR(36),
duration INTEGER,
- streamable INTEGER,
+ streamable INTEGER DEFAULT 0,
license VARCHAR(255),
downloadurl VARCHAR(255),
streamurl VARCHAR(255),
Modified: trunk/nixtape/data/Server.php
===================================================================
--- trunk/nixtape/data/Server.php 2009-04-30 21:58:46 UTC (rev 1085)
+++ trunk/nixtape/data/Server.php 2009-04-30 22:04:54 UTC (rev 1086)
@@ -202,7 +202,7 @@
AND lower(n.album) =
lower(t.album)
AND lower(n.track) =
lower(t.name)
WHERE lower(username) = " .
$mdb2->quote(strtolower($username), "text") . "
- ORDER BY n.expires DESC LIMIT " .
$mdb2->quote($number, "integer"));
+ ORDER BY t.streamable DESC, n.expires
DESC LIMIT " . $mdb2->quote($number, "integer"));
} else {
$res = $mdb2->query("SELECT
username,
@@ -224,7 +224,7 @@
ON lower(n.artist) =
lower(t.artist)
AND lower(n.album) =
lower(t.album)
AND lower(n.track) =
lower(t.name)
- ORDER BY n.expires DESC LIMIT " .
$mdb2->quote($number, "integer"));
+ ORDER BY t.streamable DESC, n.expires
DESC LIMIT " . $mdb2->quote($number, "integer"));
}
if(PEAR::isError($res)) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Librefm-commits] [1086] give free tracks precedence in Now_Playing list,
Clint Adams <=