[Dehs-devel] r72 - trunk

[atomo64-guest at alioth.debian.org]

Author: atomo64-guest
Date: 2007-12-13 01:15:29 +0000 (Thu, 13 Dec 2007)
New Revision: 72

Modified:
   trunk/dehs.sh
   trunk/dehs_pg.php
Log:
dehs_pg.php: let db_query work even when the distribution is not specified
dehs.sh: added wwiz as a run_type

Modified: trunk/dehs.sh
===================================================================
--- trunk/dehs.sh	2007-12-13 01:07:00 UTC (rev 71)
+++ trunk/dehs.sh	2007-12-13 01:15:29 UTC (rev 72)
@@ -34,6 +34,9 @@
         bogus)
                 run_type="-update_bogus"
         ;;
+        wwiz)
+                run_type="-wwiz"
+        ;;
         *)
                 echo "Unknown run-type: $1" >&2
                 exit 1

Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php	2007-12-13 01:07:00 UTC (rev 71)
+++ trunk/dehs_pg.php	2007-12-13 01:15:29 UTC (rev 72)
@@ -73,7 +73,7 @@
     elseif (in_array("-clear_db",$argv))  clear_db();
     elseif (in_array("-db_up_error",$argv))  db_up_error();
     elseif (in_array("-up_changes",$argv))  up_changes($argv[2], true);
-    elseif (in_array("-watchf",$argv) || in_array("-wwiz",$argv))  watch_wizard($argv[2]);
+    elseif (in_array("-watchf",$argv) || in_array("-wwiz",$argv))  watch_wizard((isset($argv[2])?$argv[2]:''));
     elseif (in_array("-kb_total",$argv))  print "Diff
 #stat_up_error();
 #stat_up_error();to download Kb => " . kb_total($argv[2]) . "\n" ;
@@ -234,14 +234,13 @@
     clear_db($db);
     pg_close($db);
 }
-function db_query($pkg,$dist) {
+function db_query($pkg,$dist='%') {
     global $dirs,$dbconn;
     $db = pg_pconnect($dbconn )  or  die_status(pg_last_error($db));
     $rsql=pg_exec($db, "SELECT pkgs.* ,mpop_inst FROM (SELECT name,MAX(binpkgs.pop_inst) AS mpop_inst FROM binpkgs GROUP BY name)
 									AS binpkgs INNER JOIN pkgs ON pkgs.name=binpkgs.name
 		              WHERE pkgs.name='$pkg' AND dist='$dist';");
-    if (pg_numrows($rsql)==1) {
-        $res_array=pg_fetch_array($rsql);
+    while ($res_array=pg_fetch_array($rsql)) {
         print "Package=> " . $res_array['name'] . "\n";
         print "Version => " . $res_array['version'] . "\n";
         print "Diff MD5 Downloaded => " . $res_array['md5_diff'] . "\n";
@@ -253,19 +252,19 @@
         if ($res_array['watch']) {
             $uscan_res=uscan_foo($res_array['name'] ,$res_array['version'],$res_array['watch']);
             print "Version Upstream => " . $uscan_res[0] . "\n";
-            print "Watch => " . $res_array['watch'];
+            print "Watch => " . trim($res_array['watch'])."\n";
             print "Watch Warnings => " . $uscan_res[1];
         }
         else print "Watch => Not present" . "\n";
         if ($res_array['wwiz_type']) {
             $uscan_res=uscan_foo($res_array['name'] ,$res_array['version'],$res_array['wwiz']);
             print "WWiz Upstream => " . $uscan_res[0] . "\n";
-            print "WWiz => " . $res_array['wwiz'];
+            print "WWiz => " . $res_array['wwiz']."\n";
             print "WWiz Warings => " . $uscan_res[1];
         }
 	print "\n";
     }
-    else echo "Package=> " . $pkg . "\nNot found\n!!";
+    if (pg_numrows($rsql)==0) echo "Package=> " . $pkg . "\nNot found\n!!";
     pg_close($db);
 }
 function byte_total(&$db,$initial) {