[Dehs-devel] r77 - trunk

[atomo64-guest at alioth.debian.org]

Author: atomo64-guest
Date: 2007-12-16 01:53:08 +0000 (Sun, 16 Dec 2007)
New Revision: 77

Modified:
   trunk/dehs_pg.php
Log:
dversionmangled database field should also be set when updating/adding from Sources


Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php	2007-12-16 00:49:38 UTC (rev 76)
+++ trunk/dehs_pg.php	2007-12-16 01:53:08 UTC (rev 77)
@@ -207,9 +207,9 @@
                             $matches[10]=pg_escape_string($matches[10]);
                         }
                         @pg_exec($db,"INSERT INTO pkgs_atsrc (name,dist) VALUES ('$matches[1]','$dist')") OR die_status("Temp table pkgs_atsrc query error");
-                        $rst=@pg_exec($db, "INSERT INTO pkgs (name,version,maint,dir,md5_atsource,bytes,dist,section,uploaders) VALUES ('$matches[1]','$matches[4]','$matches[5]','$matches[6]','$matches[7]','$matches[8]','$dist','$section','$matches[10]')") ;
+                        $rst=@pg_exec($db, "INSERT INTO pkgs (name,version,dversionmangled,maint,dir,md5_atsource,bytes,dist,section,uploaders) VALUES ('$matches[1]','$matches[4]','$matches[4]','$matches[5]','$matches[6]','$matches[7]','$matches[8]','$dist','$section','$matches[10]')") ;
                         if (!$rst) {
-                            $rst=@pg_exec($db, "UPDATE pkgs SET name='$matches[1]',version='$matches[4]',maint='$matches[5]',dir='$matches[6]',md5_atsource='$matches[7]',bytes='$matches[8]',dist='$dist',section='$section',uploaders='$matches[10]' WHERE name='$matches[1]' AND dist='$dist'") OR die_status("\nDb adding error =>" . pg_last_error() . "\n");
+                            $rst=@pg_exec($db, "UPDATE pkgs SET name='$matches[1]',version='$matches[4]',dversionmangled='$matches[4]',maint='$matches[5]',dir='$matches[6]',md5_atsource='$matches[7]',bytes='$matches[8]',dist='$dist',section='$section',uploaders='$matches[10]' WHERE name='$matches[1]' AND dist='$dist'") OR die_status("\nDb adding error =>" . pg_last_error() . "\n");
                         }
                         $bin_names=split(",", $matches[2]);
                         foreach ($bin_names as $bin_name) {
@@ -942,7 +942,7 @@
     $sql="SELECT name FROM pkgs WHERE up_version='' AND watch!=''";
     $rsql=pg_exec($db, $sql);
     $res_array=pg_fetch_all($rsql);
-    pg_close($db);
+    $orig_count = ((!is_array($res_array))?0:count($res_array));
     if ($res_array !== false) {
         foreach ($res_array as $entry) {
             db_upstream($entry['name']);
@@ -950,8 +950,15 @@
         }
         dehsqa_db();
     }
+    $sql="SELECT COUNT(name) FROM pkgs WHERE up_version='' AND watch!=''";
+    $rsql=pg_exec($db, $sql);
+    $res_array=pg_fetch_array($rsql);
+    $new_count = (int)$res_array[0];
+    pg_close($db);
     $endtime=gmdate('D, d M Y H:i:s \C\E\S\T',time()+3600*2);
-    $messaggio="Dehs executed successful\nBegin: $intime\nPackages processed: ".((!is_array($res_array))?'none':count($res_array))."\nEnd: $endtime";
+    $messaggio="Dehs executed successful\nBegin: $intime\n".
+    "Packages processed: $orig_count\n" .
+    "New bogus watches count: $new_count\nEnd: $endtime";
     mail($email_all, "DEHS update_bogus report", $messaggio,
     "From: dehs-noreply@{$_SERVER['SERVER_NAME']}\r\n" .
     "Reply-To: dehs-noreply@{$_SERVER['SERVER_NAME']}\r\n" .