cellog Wed Oct 18 05:17:51 2006 UTC
Modified files:
/peclweb/include pear-database.php
Log:
sync to pearweb, remove last live reference to downloads table
http://cvs.php.net/viewvc.cgi/peclweb/include/pear-database.php?r1=1.167&r2=1.168&diff_format=u
Index: peclweb/include/pear-database.php
diff -u peclweb/include/pear-database.php:1.167
peclweb/include/pear-database.php:1.168
--- peclweb/include/pear-database.php:1.167 Wed Oct 18 00:42:20 2006
+++ peclweb/include/pear-database.php Wed Oct 18 05:17:51 2006
@@ -18,7 +18,7 @@
| Martin Jansen <mj@xxxxxxx> |
| Gregory Beaver <cellog@xxxxxxx> |
+----------------------------------------------------------------------+
- $Id: pear-database.php,v 1.167 2006/10/18 00:42:20 cellog Exp $
+ $Id: pear-database.php,v 1.168 2006/10/18 05:17:51 cellog Exp $
*/
require_once 'DB/storage.php';
@@ -2747,22 +2747,16 @@
{
global $dbh;
- $query = "SELECT r.releasedate, r.version, d.release, COUNT(d.id) AS
total,"
- . " MAX(d.dl_when) AS last_download,"
- . " MIN(d.dl_when) AS first_download"
- . " FROM downloads d, releases r"
- . " WHERE d.package = '" . $id . "'"
- . " AND d.release = r.id"
- . ($rid != "" ? " AND d.release = '" . $rid . "'" : "")
- . " GROUP BY d.release";
-
- $rows = $dbh->getAll($query, DB_FETCHMODE_ASSOC);
-
- if (DB::isError($rows)) {
- return PEAR::raiseError($rows->getMessage());
- } else {
- return $rows;
+ $query = 'SELECT s.release, s.dl_number, s.last_dl, r.releasedate '
+ . 'FROM package_stats AS s '
+ . 'LEFT JOIN releases AS r ON (s.rid = r.id) '
+ . "WHERE pid = " . (int)$id;
+ if (!empty($rid)) {
+ $query .= " AND rid = " . (int)$rid;
}
+ $query .= " GROUP BY rid ORDER BY rid DESC";
+
+ return $dbh->getAll($query, DB_FETCHMODE_ASSOC);
}
// }}}
|
