[Collab-qa-commits] r958 - in udd/src: . udd

[neronus-guest at alioth.debian.org]

Author: neronus-guest
Date: 2008-07-28 14:56:37 +0000 (Mon, 28 Jul 2008)
New Revision: 958

Modified:
   udd/src/setup-db.sql
   udd/src/udd/popcon_gatherer.py
Log:
Forgot to remove print statement in popcon_gatherer
Added insts to popcon_src_* views


Modified: udd/src/setup-db.sql
===================================================================
--- udd/src/setup-db.sql	2008-07-28 14:50:28 UTC (rev 957)
+++ udd/src/setup-db.sql	2008-07-28 14:56:37 UTC (rev 958)
@@ -46,7 +46,7 @@
  (package text, version text, date timestamp with time zone, changed_by text, maintainer text, nmu boolean, signed_by text, key_id text);
 
 CREATE VIEW popcon_src_average AS
-  SELECT sources.package, avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, sources.distribution
+  SELECT sources.package, avg(insts), avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, sources.distribution
     FROM sources, popcon,
           (SELECT DISTINCT packages.package, packages.source, packages.distribution FROM packages) as packages
     WHERE 
@@ -57,7 +57,7 @@
     GROUP BY sources.package, sources.distribution;
 
 CREATE VIEW popcon_src_max AS
-  SELECT sources.package, max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, sources.distribution
+  SELECT sources.package, max(insts), max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, sources.distribution
     FROM sources, popcon,
           (SELECT DISTINCT packages.package, packages.source, packages.distribution FROM packages) as packages
     WHERE 

Modified: udd/src/udd/popcon_gatherer.py
===================================================================
--- udd/src/udd/popcon_gatherer.py	2008-07-28 14:50:28 UTC (rev 957)
+++ udd/src/udd/popcon_gatherer.py	2008-07-28 14:56:37 UTC (rev 958)
@@ -54,7 +54,6 @@
 	  continue
 	query = "EXECUTE pop_insert('%s', %s, %s, %s, %s, %s)" %\
 	    (name, int(vote) + int(old) + int(recent) + int(nofiles), vote, old, recent, nofiles)
-	print query
 	cur.execute(query)
       except ValueError:
 	continue