[Dehs-devel] r107 - in trunk: . www
atomo64-guest at alioth.debian.org
atomo64-guest at alioth.debian.org
Mon Feb 11 02:01:18 UTC 2008
Author: atomo64-guest
Date: 2008-02-11 02:01:17 +0000 (Mon, 11 Feb 2008)
New Revision: 107
Modified:
trunk/dehs.config.inc
trunk/dehs_pg.php
trunk/update_wwwal.sh
trunk/www/config_www.inc
trunk/www/wwiz_detail.php
Log:
Specify host=localhost to fix some, recent, problems connecting to the database
Set lastupvsdebsync to 1970-01-01 00:00:00 if null
Modified: trunk/dehs.config.inc
===================================================================
--- trunk/dehs.config.inc 2008-02-06 04:07:10 UTC (rev 106)
+++ trunk/dehs.config.inc 2008-02-11 02:01:17 UTC (rev 107)
@@ -1,6 +1,6 @@
<?php
-$dbconn = 'dbname=dehs';
+$dbconn = 'dbname=dehs host=localhost';
$base = '/org/home/groups/dehs/dehs_prj/dehs/';
Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php 2008-02-06 04:07:10 UTC (rev 106)
+++ trunk/dehs_pg.php 2008-02-11 02:01:17 UTC (rev 107)
@@ -500,6 +500,10 @@
$lastupvsdebsync = sqldate();
}
+ if ($lastupvsdebsync === null) {
+ $lastupvsdebsync = sqldate(0);
+ }
+
if ($uscan_res[0]!=$res_array[up_version]) ($keep_changes=1);
else $keep_changes=0;
Modified: trunk/update_wwwal.sh
===================================================================
--- trunk/update_wwwal.sh 2008-02-06 04:07:10 UTC (rev 106)
+++ trunk/update_wwwal.sh 2008-02-11 02:01:17 UTC (rev 107)
@@ -10,56 +10,56 @@
php4 -q $WORKDIR/www/no_watch.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.html
php4 -q $WORKDIR/www/no_upstream.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.html
php4 -q $WORKDIR/www/no_updated.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.html
- psql -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' ORDER BY name ASC;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.txt
- psql -A -q -d dehs -c "SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.txt
- psql -A -q -d dehs -c "SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable' AND updated='0' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.txt
- psql -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' UNION SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' UNION SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable';" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_debianqa.txt
- psql -A -q -d dehs -c "SELECT name,version,up_version,lastupvsdebsync FROM pkgs WHERE up_version!='' AND up_version IS NOT NULL AND watch!='' AND watch IS NOT NULL AND updated='0' AND dist='unstable'" | egrep -v '\?column\?|rows\)' | grep -v 'name|version|up_version|lastupvsdebsync' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/ddpomail.txt
+ psql -h localhost -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' ORDER BY name ASC;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.txt
+ psql -h localhost -A -q -d dehs -c "SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.txt
+ psql -h localhost -A -q -d dehs -c "SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable' AND updated='0' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.txt
+ psql -h localhost -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' UNION SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' UNION SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable';" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_debianqa.txt
+ psql -h localhost -A -q -d dehs -c "SELECT name,version,up_version,lastupvsdebsync FROM pkgs WHERE up_version!='' AND up_version IS NOT NULL AND watch!='' AND watch IS NOT NULL AND updated='0' AND dist='unstable'" | egrep -v '\?column\?|rows\)' | grep -v 'name|version|up_version|lastupvsdebsync' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/ddpomail.txt
fi
STATS=/org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.txt
cat /dev/null > $STATS.new
echo -n 'watch_count:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_count_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_count_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch IS NULL OR watch='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch IS NULL OR watch='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_failed:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_failed_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_failed_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'wwiz_count:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'wwiz_count_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'wwiz_count_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_count:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_count_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_count_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_real_count:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_real_count_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_real_count_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_wwiz_count:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_wwiz_count_unstable:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_wwiz_count_experimental:' >> $STATS.new
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
mv $STATS.new $STATS
php4 -q $WORKDIR/www/stats.html > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.html "$STATS"
Modified: trunk/www/config_www.inc
===================================================================
--- trunk/www/config_www.inc 2008-02-06 04:07:10 UTC (rev 106)
+++ trunk/www/config_www.inc 2008-02-11 02:01:17 UTC (rev 107)
@@ -1,5 +1,5 @@
<?
-$db = @pg_pconnect("dbname=dehs");
+$db = @pg_pconnect("dbname=dehs host=localhost");
if (!$db) {
echo "Db error";
die(1);
Modified: trunk/www/wwiz_detail.php
===================================================================
--- trunk/www/wwiz_detail.php 2008-02-06 04:07:10 UTC (rev 106)
+++ trunk/www/wwiz_detail.php 2008-02-11 02:01:17 UTC (rev 107)
@@ -18,8 +18,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
if (array_key_exists("id",$_GET) and is_numeric($_GET[id])) {
+ require("config_www.inc");
header("Content-Type: text/plain");
- $db = @pg_connect("dbname=dehs") or die("Db error: Alioth postgres overloaded?");
$sql="SELECT wwiz,watch, up_changes FROM pkgs where id=" . $_GET[id];
$rsql=pg_exec($db, $sql);
$res_array=pg_fetch_array($rsql);
More information about the Dehs-devel
mailing list