cvs: pearweb /include pear-database.php

dickmann Thu Jul 11 16:43:26 2002 EDT Modified files: /pearweb/include pear-database.php Log: fix dependency bug Index: pearweb/include/pear-database.php diff -u pearweb/include/pear-database.php:1.101 pearweb/include/pear-database.php:1.102 --- pearweb/include/pear-database.php:1.101 Fri Jul 5 23:41:29 2002 +++ pearweb/include/pear-database.php Thu Jul 11 16:43:26 2002 @@ -17,7 +17,7 @@ | Tomas V.V.Cox <cox@php.net> | | Martin Jansen <mj@php.net> | +----------------------------------------------------------------------+ - $Id: pear-database.php,v 1.101 2002/07/06 03:41:29 alan_k Exp $ + $Id: pear-database.php,v 1.102 2002/07/11 20:43:26 dickmann Exp $ */ require_once 'DB/storage.php'; @@ -251,7 +251,7 @@ "WHERE package = ?". "ORDER BY releasedate DESC"; $notes_sql = "SELECT id, nby, ntime, note FROM notes WHERE pid = ?"; - $deps_sql = "SELECT type, relation, version, name + $deps_sql = "SELECT type, relation, version, name, release FROM deps WHERE package = ?"; if ($field === null) { @@ -269,7 +269,17 @@ $dbh->getAll($deps_sql, array($info['packageid']), DB_FETCHMODE_ASSOC); foreach($deps as $dep) { - $info['releases'][$dep['version']]['deps'][] = $dep; + $rel_version = null; + foreach($info['releases'] as $version => $rel) { + if ($rel['id'] == $dep['release']) { + $rel_version = $version; + break; + }; + }; + if ($rel_version !== null) { + unset($dep['release']); + $info['releases'][$rel_version]['deps'][] = $dep; + }; }; } else { // get a single field @@ -352,6 +362,7 @@ $_deps = array(); foreach($deps as $dep) { if ($dep['package'] == $packageinfo[$pkg]['packageid'] + && isset($stablereleases[$pkg]) && $dep['release'] == $stablereleases[$pkg]['rid']) { unset($dep['rid']); @@ -845,8 +856,8 @@ $dbh->query("DELETE FROM releases WHERE id = $release_id"); @unlink($file); return $ok; - } - + }; + // Update Cache include_once 'xmlrpc-cache.php'; XMLRPC_Cache::remove('package.listAll', array(false));