[Dehs-devel] r191 - trunk
Raphael Geissert
geissert at alioth.debian.org
Mon Jul 4 22:58:32 UTC 2011
Author: geissert
Date: 2011-07-04 22:58:32 +0000 (Mon, 04 Jul 2011)
New Revision: 191
Modified:
trunk/dehs_pg.php
Log:
cleanup
Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php 2011-02-12 07:32:49 UTC (rev 190)
+++ trunk/dehs_pg.php 2011-07-04 22:58:32 UTC (rev 191)
@@ -22,46 +22,19 @@
*/
// stabilire una connessione
-#ini_set ( "error_reporting", "E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR");
+ini_set ( "error_reporting", "E_ALL");
ini_set ("html_errors", "off");
set_time_limit(0);
ini_set ( "memory_limit", "120M");
-#print_R($_SERVER);
+
require "dehs.config.inc";
require "events.class.php";
# Use PEAR: Archive_Tar to uncompress 3.0 debian.tar.gz files
require "PEAR.php";
require "Archive/Tar.php";
+
dir_ctrl($dirs);
-if (!function_exists('file_get_contents')) {
- function file_get_contents($filename) {
- if (!($file = fopen($filename,"rb"))) return false;
- else {
- $contents = "";
- do {
- $data = fread($file, 4096);
- if (strlen($data) == 0) {
- break;
- }
- $contents .= $data;
- } while (true);
- fclose($file);
- return $contents;
- }
- }
-}
-if (!function_exists('file_put_contents')) {
- function file_put_contents($filename, $content, $flags = 0) {
- if (!($file = fopen($filename,$flags))) return false;
- else {
- $n = fwrite($file, $content);
- fclose($file);
- return true;
- }
- }
-}
-
if (in_array("-db_add",$argv)) db_add((!empty($argv[2])?$argv[2]:''), false);
elseif (in_array("-db_query",$argv)) db_query($argv[2],(!empty($argv[3])?$argv[3]:'%') );
elseif (in_array("-dl_diffs",$argv) || in_array("-keep_diff",$argv)) dl_diffs($argv[2]);
@@ -79,12 +52,10 @@
elseif (in_array("-db_up_error",$argv)) db_up_error();
elseif (in_array("-up_changes",$argv)) up_changes((!empty($argv[2])?$argv[2]:'%'), true);
elseif (in_array("-watchf",$argv) || in_array("-wwiz",$argv)) watch_wizard((!empty($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" ;
+ elseif (in_array("-kb_total",$argv)) print "Diff to download Kb => " . kb_total($argv[2]) . "\n" ;
elseif (in_array("-watch_stat",$argv)) watch_stat();
else print "Command $argv[1] not found\n";
-#stat_up_error();
+
function dir_ctrl($dirs) {
if (!is_array($dirs)) {
$dirs = array($dirs);
@@ -94,8 +65,10 @@
if ($res != 0) die_status("Error creating basic dir: $dir\n");
}
}
+
function ext_watch ($file,$pkg,$version) {
if (!file_exists($file)) return "";
+
if (substr($file,-8) == ".diff.gz") {
// Format: 1.0
$zp=gzopen($file,"r") or die_status("Fail to open $file");
@@ -104,7 +77,7 @@
if (preg_match('/\+\+\+\s.+\/debian\/watch$/',$line)) {
$line = gzgets ($zp,4096);
preg_match ("/.+\+\d+\,(\d+)\s/",$line,$watch_lenght);
- for ($i = 1; $i <= $watch_lenght[1]; $i++) {
+ for ($i = 1; $i <= $watch_lenght[1]; $i++) {
$line=gzgets ($zp,4096);
$watch .=substr($line,1);
}
@@ -122,10 +95,9 @@
}
function ftp_cn($login,$password,$ftp_server) {
$conn_id = @ftp_connect($ftp_server) or die_status("Error: Cannot contact ftp server $ftp_server\n");
- // login con user name e password
ftp_pasv($conn_id,1);
$login_result = ftp_login($conn_id, "anonymous","bo at bo.org");
- // controllo della connessione
+
if ((!$conn_id) || (!$login_result)) {
echo "Ftp connection failed!\n";
echo "Failed connection to $ftp_server\n";
@@ -138,15 +110,14 @@
global $dirs,$dbconn,$mirrors;
check_db();
$conn_normal=ftp_cn("anonymous","bo at bo.org",$mirrors['unstable']);
- #$conn_non_us=ftp_cn("anonymous","bo at bo.org",$mirrors["non-US"]);
$db = pg_pconnect($dbconn) ;
$rsql=pg_exec($db, "SELECT * FROM pkgs WHERE name like '$initial%' AND (md5_diff!=md5_atsource or md5_diff is null)") OR die_status("Error in diff query\n");
$total=pg_numrows($rsql);
$btotal=byte_total($db,$initial);
+
print "Total Diff to download Kb => " . number_format ($btotal/1024, 2, ",",".") . "\n";
+
while ($res_array=pg_fetch_array($rsql)) {
- #if ($res_array['dist']=='non-US') $conn_id = $conn_non_us;
- #else
$conn_id = $conn_normal;
if ($localfile=download_diff($conn_id,$res_array[name],$res_array[version],$res_array['dir'],$res_array[md5_diff],$res_array[md5_atsource],$res_array[bytes],$res_array[dist])) {
$watch=ext_watch($localfile,$res_array[name],$res_array[version]);
@@ -392,7 +363,6 @@
$release=file_get_contents ("ftp://$mirrors[$dist]" . remote_dist_dir($dist) . "/$dist/Release") or die_status("Failed to check MD5 of sources");
preg_match ("/\s([^\s]+)\s+(\d+)\s$section\/source\/Sources\.gz/i", $release,$matches);
return array("md5"=>$matches[1],"bytes"=>$matches[2]);
- # 183dea9ca3c2e35ffd6cf5eee9501c21 2941637 main/binary-i386/Packages.gz
}
function vers_conv($debvers, $extendedConv = true) {
@@ -473,15 +443,9 @@
print "Watch presence rate => " . number_format ($tot_watch[0]/($tot_nowatch[0]+$tot_watch[0])*100, 2, ",",".") . "%\n";
}
function remote_dist_dir($dist) {
- #if ($dist=="non-US") return "/debian-non-US/dists/unstable";
- #else
return "/debian/dists";
}
function clear_db(&$db) {
- #global $dbconn;
- #if (check_db()) die_status("Il Database era vuoto\n");
- #download_sources();
- #$db = pg_pconnect($dbconn) or die_status(pg_result_error($db));
$sql1= "Delete from binpkgs where id NOT IN
(select id FROM binpkgs INNER JOIN bin_atsrc USING (name,bin_name,dist))" ;
$sql2= "Delete from pkgs where id NOT IN (select id FROM pkgs INNER JOIN pkgs_atsrc USING (name,dist))" ;
@@ -670,28 +634,11 @@
}
function keep_remote ($localfile,$remotefile) {
if (!check_url($remotefile)) return false;
- # $rfp = @fopen ($remotefile, "r");
- # if (!$rfp) {
- # return false;
- # }
- # fclose($rfp);
- # $lfp = fopen ($localfile, "w");
- # stream_set_blocking($rfp,0);
- # ini_set ( "memory_limit", "100M");
- # while (!feof($rfp)) {
- # $data = fread($rfp, 8192);
- # $bytes+=8192;
- # print "Downlaoding $remotefile: $bytes\r";
- # fwrite($lfp, $data);
- # } while (true);
- # ini_set ( "memory_limit", "15M");
if (!copy($remotefile, $localfile)) {
echo "Copia di $file non riuscita ...\n";
return false;
}
- # fclose($lfp);
- # fclose($rfp);
return true;
}
@@ -1233,4 +1180,3 @@
return true;
}
-?>
\ No newline at end of file
More information about the Dehs-devel
mailing list