[Dehs-devel] r121 - trunk
atomo64-guest at alioth.debian.org
atomo64-guest at alioth.debian.org
Thu Mar 20 05:02:16 UTC 2008
Author: atomo64-guest
Date: 2008-03-20 05:02:15 +0000 (Thu, 20 Mar 2008)
New Revision: 121
Modified:
trunk/dehs_pg.php
Log:
Skip packages for which the wwiz failed to generate a watch file on last attempt (either a 'no_cirght' or a 'notmatch')
uscan_foo(): return an easier to read hash array
Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php 2008-03-19 21:04:34 UTC (rev 120)
+++ trunk/dehs_pg.php 2008-03-20 05:02:15 UTC (rev 121)
@@ -218,6 +218,8 @@
if ($version != $matches[4]) {
// only update the dversionmangled field if the versions differ
$extra = ",dversionmangled='$matches[4]'";
+ // and reset wwiz_type
+ $extra = ",wwiz_type=NULL";
}
$rst=@pg_exec($db, "UPDATE pkgs SET name='$matches[1]',version='$matches[4]'$extra,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");
}
@@ -261,16 +263,16 @@
print "Pop Inst=>" . $res_array['mpop_inst'] . "\n";
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 "Version Upstream => " . $uscan_res['uversion'] . "\n";
print "Watch => " . trim($res_array['watch'])."\n";
- print "Watch Warnings => " . $uscan_res[1];
+ print "Watch Warnings => " . $uscan_res['warnings'];
}
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 Upstream => " . $uscan_res['uversion'] . "\n";
print "WWiz => " . $res_array['wwiz']."\n";
- print "WWiz Warings => " . $uscan_res[1];
+ print "WWiz Warings => " . $uscan_res['warnings'];
}
print "\n";
}
@@ -488,30 +490,30 @@
$uscan_res=uscan_foo($res_array['name'],$res_array['version'],$res_array['watch']);
- #print $uscan_res[0] . "\n Name => $res_array[name]\n";
+ #print $uscan_res['uversion'] . "\n Name => $res_array[name]\n";
$version = $res_array['version'];
$dversionmangled = $res_array['version'];
$lastupvsdebsync = $res_array['lastupvsdebsync'];
$mangle = true;
- print "\rVersion=>" . $uscan_res[3];
- if ($uscan_res[3]!=null) $version=$uscan_res[3];
- if ($uscan_res[5]!=null && $uscan_res[5] != vers_conv($res_array['version'])) {
- $dversionmangled=$uscan_res[5];
+ print "\rVersion=>" . $uscan_res['dversion'];
+ if ($uscan_res['dversion']!=null) $version=$uscan_res['dversion'];
+ if ($uscan_res['dversionmangled']!=null && $uscan_res['dversionmangled'] != vers_conv($res_array['version'])) {
+ $dversionmangled=$uscan_res['dversionmangled'];
$mangle = false;
}
- $up_url=iconv("ISO-8859-1","UTF-8",$uscan_res[2]);
- $up_version=iconv("ISO-8859-1","UTF-8",$uscan_res[0]);
+ $up_url=iconv("ISO-8859-1","UTF-8",$uscan_res['uurl']);
+ $up_version=iconv("ISO-8859-1","UTF-8",$uscan_res['uversion']);
- $updated = $uscan_res[4];
+ $updated = $uscan_res['updated'];
/*if (!$updated)*/ {
- $updated=is_updated($uscan_res[0], $dversionmangled, !$mangle);
+ $updated=is_updated($uscan_res['uversion'], $dversionmangled, !$mangle);
}
if (!$updated) {
- events::newVersion($res_array['name'], $res_array['version'], $uscan_res[0], $res_array['dist'], $up_url);
+ events::newVersion($res_array['name'], $res_array['version'], $uscan_res['uversion'], $res_array['dist'], $up_url);
} else {
$lastupvsdebsync = sqldate();
}
@@ -520,16 +522,16 @@
$lastupvsdebsync = sqldate(0);
}
- if ($uscan_res[0]!=$res_array[up_version]) ($keep_changes=1);
+ if ($uscan_res['uversion']!=$res_array[up_version]) ($keep_changes=1);
else $keep_changes=0;
$watch_warn='';
- if($uscan_res[1] != null) {
- $watch_warn=pg_escape_string(iconv("ISO-8859-1","UTF-8", $uscan_res[1]));
+ if($uscan_res['warnings'] != null) {
+ $watch_warn=pg_escape_string(iconv("ISO-8859-1","UTF-8", $uscan_res['warnings']));
}
pg_exec($db, "UPDATE pkgs SET up_version='" . pg_escape_string($up_version) . "', dversionmangled='".pg_escape_string($dversionmangled)."',up_url='" . pg_escape_string($up_url) . "', watch_warn='" . $watch_warn . "',keep_changes='$keep_changes', wwiz_version=NULL, wwiz_type=NULL, wwiz=NULL, updated='$updated', lastcheck=now(), lastupvsdebsync='$lastupvsdebsync' WHERE id=$res_array[id]") or die_status("Error in update pkgs upstream");
- #print "\rUpdated " . $res_array['name'] . " => $updated Up Version => ". $uscan_res[0];
+ #print "\rUpdated " . $res_array['name'] . " => $updated Up Version => ". $uscan_res['uversion'];
print "\t Upstream left => " . $tot --;
# }
# else print "Added ". $res_array['name'] ."\n";
@@ -537,8 +539,8 @@
# print "Package=> " . $res_array['name'] . "\n";
# print "Version => " . $res_array['version'] . "\n";
- # print "Upstream Ver=> " . $uscan_res[0] . "\n";
- #print "Watch warings=> " . $uscan_res[1] . "\n";
+ # print "Upstream Ver=> " . $uscan_res['uversion'] . "\n";
+ #print "Watch warings=> " . $uscan_res['warnings'] . "\n";
# }
}
print "\n";
@@ -665,7 +667,15 @@
if ($warnings=='') $warnings=null;
if ($deb_mangled_vers=='') $deb_mangled_vers=null;
- return array($upstream, $warnings, $up_url, $deb_vers, $updated, $deb_mangled_vers);
+ $ret = array();
+ $ret['uversion'] = $upstream;
+ $ret['warnings'] = $warnings;
+ $ret['uurl'] = $up_url;
+ $ret['dversion'] = $deb_vers;
+ $ret['dversionmangled'] = $deb_mangled_vers;
+ $ret['updated'] = $updated;
+
+ return $ret;
}
function db_up_error() {
global $dbconn;
@@ -743,7 +753,8 @@
$postWHERE = '';
if ($checkStamps) {
- $postWHERE = "AND (lastcheck<='".sqldate(time() - ($minimumAge*24*3600))."' OR lastcheck IS NULL)";
+ $postWHERE = "AND (lastcheck<='".sqldate(time() - ($minimumAge*24*3600))."' OR lastcheck IS NULL)"
+ . "AND wwiz_type!='no_cright' AND wwiz_type!='notmatch'";
}
$postORDER = '';
@@ -836,7 +847,7 @@
if (empty($generatedWatches)) {
$notmatch++;
$contents=iconv("ISO-8859-1","UTF-8",$contents);
- pg_exec($db, "UPDATE pkgs SET wwiz_version=NULL, wwiz='" . pg_escape_string($contents) . "', wwiz_type='notmatch', up_url='', up_changes='',keep_changes='f' where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
+ pg_exec($db, "UPDATE pkgs SET wwiz_version=NULL, wwiz='" . pg_escape_string($contents) . "', wwiz_type='notmatch', up_url='', up_changes='', lastcheck=now(), keep_changes='f' where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
} else {
@@ -854,35 +865,35 @@
$uscan_res=uscan_foo($res_array['name'] ,$res_array['version'],$watch);
- if ($uscan_res[0] && levenshtein($uscan_res[0], $res_array['version']) < strlen($res_array['version'])) {
+ if ($uscan_res['uversion'] && levenshtein($uscan_res['uversion'], $res_array['version']) < strlen($res_array['version'])) {
break;
}
}
- if ($uscan_res[1] && !$uscan_res[0]) {
- pg_exec($db, "UPDATE pkgs SET wwiz_version=NULL, wwiz='" . pg_escape_string($uscan_res[1]) . "', wwiz_type='error', up_url='', up_changes='', keep_changes='f' where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
+ if ($uscan_res['warnings'] && !$uscan_res['uversion']) {
+ pg_exec($db, "UPDATE pkgs SET wwiz_version=NULL, wwiz='" . pg_escape_string($uscan_res['warnings']) . "', wwiz_type='error', up_url='', up_changes='', lastcheck=now(), keep_changes='f' where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
$errors++;
} else {
$verok++;
- if ($uscan_res[0] != $res_array['wwiz_version']) {
+ if ($uscan_res['uversion'] != $res_array['wwiz_version']) {
$keep_changes = 1;
} else {
$keep_changes = 0;
}
$dversionmangled = $res_array[version];
- if ($uscan_res[5]!=null && $uscan_res[5] != vers_conv($res_array['version'])) $dversionmangled=$uscan_res[5];
+ if ($uscan_res['dversionmangled']!=null && $uscan_res['dversionmangled'] != vers_conv($res_array['version'])) $dversionmangled=$uscan_res['dversionmangled'];
- $updated = $uscan_res[4];
+ $updated = $uscan_res['updated'];
/*if ($updated)*/ {
- $updated = is_updated($uscan_res[0], $dversionmangled, $dversionmangled != $uscan_res[5]);
+ $updated = is_updated($uscan_res['uversion'], $dversionmangled, $dversionmangled != $uscan_res['dversionmangled']);
}
/*if (!$updated) {
- events::newVersion($res_array['name'], $res_array['version'], $uscan_res[0], $res_array['dist']);
+ events::newVersion($res_array['name'], $res_array['version'], $uscan_res['uversion'], $res_array['dist']);
}*/
- pg_exec($db, "UPDATE pkgs SET wwiz='" . pg_escape_string($watch) ."', wwiz_type='watch', wwiz_version='" . pg_escape_string($uscan_res[0]) . "',dversionmangled='".pg_escape_string($dversionmangled)."', up_url='" . pg_escape_string($uscan_res[2]) . "', keep_changes='$keep_changes', updated='$updated', lastcheck=now() where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
+ pg_exec($db, "UPDATE pkgs SET wwiz='" . pg_escape_string($watch) ."', wwiz_type='watch', wwiz_version='" . pg_escape_string($uscan_res['uversion']) . "',dversionmangled='".pg_escape_string($dversionmangled)."', up_url='" . pg_escape_string($uscan_res['uurl']) . "', keep_changes='$keep_changes', updated='$updated', lastcheck=now() where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
}
}
} else {
More information about the Dehs-devel
mailing list