[Collab-qa-commits] r991 - in udd: src web/cgi-bin

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-08-08 02:13:10 +0000 (Fri, 08 Aug 2008)
New Revision: 991

Modified:
   udd/src/setup-db.sql
   udd/web/cgi-bin/sources_in_ubuntu_but_not_in_debian_by_popcon.cgi
   udd/web/cgi-bin/sources_in_unstable_but_not_in_testing_by_popcon_max.cgi
Log:
fixed popcon_src_{max,average}: group on (src, distro). also fixed CGIs

Modified: udd/src/setup-db.sql
===================================================================
--- udd/src/setup-db.sql	2008-08-08 01:34:12 UTC (rev 990)
+++ udd/src/setup-db.sql	2008-08-08 02:13:10 UTC (rev 991)
@@ -70,22 +70,22 @@
   maintainer text, nmu boolean, signed_by text, key_id text);
 
 CREATE VIEW popcon_src_average AS
-  SELECT packages.package, avg(insts) AS insts, avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, packages.distribution
+  SELECT packages.source, avg(insts) AS insts, avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, packages.distribution
     FROM popcon,
           (SELECT DISTINCT packages.package, packages.source, packages.distribution FROM packages) as packages
     WHERE 
 	  popcon.package = packages.package AND
 	  popcon.distribution = packages.distribution
-    GROUP BY packages.source, packages.distribution, packages.package;
+    GROUP BY packages.source, packages.distribution;
 
 CREATE VIEW popcon_src_max AS
-  SELECT packages.package, max(insts) AS insts, max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, packages.distribution
+  SELECT packages.source, max(insts) AS insts, max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, packages.distribution
     FROM popcon,
           (SELECT DISTINCT packages.package, packages.source, packages.distribution FROM packages) as packages
     WHERE 
 	  popcon.package = packages.package AND
 	  popcon.distribution = packages.distribution
-    GROUP BY packages.source, packages.distribution, packages.package;
+    GROUP BY packages.source, packages.distribution;
 
 CREATE INDEX packages_source_idx on packages(source);
 CREATE INDEX sources_distribution_idx on sources(distribution);

Modified: udd/web/cgi-bin/sources_in_ubuntu_but_not_in_debian_by_popcon.cgi
===================================================================
--- udd/web/cgi-bin/sources_in_ubuntu_but_not_in_debian_by_popcon.cgi	2008-08-08 01:34:12 UTC (rev 990)
+++ udd/web/cgi-bin/sources_in_ubuntu_but_not_in_debian_by_popcon.cgi	2008-08-08 02:13:10 UTC (rev 991)
@@ -15,7 +15,7 @@
              popcon_src_max
         WHERE NOT EXISTS (SELECT * FROM sources WHERE distribution = 'debian'
                           and package = intrepid.package)
-              AND popcon_src_max.package = intrepid.package AND popcon_src_max.distribution = 'ubuntu' ORDER BY insts DESC;
+              AND popcon_src_max.source = intrepid.package AND popcon_src_max.distribution = 'ubuntu' ORDER BY insts DESC;
 EOF
 	);
 

Modified: udd/web/cgi-bin/sources_in_unstable_but_not_in_testing_by_popcon_max.cgi
===================================================================
--- udd/web/cgi-bin/sources_in_unstable_but_not_in_testing_by_popcon_max.cgi	2008-08-08 01:34:12 UTC (rev 990)
+++ udd/web/cgi-bin/sources_in_unstable_but_not_in_testing_by_popcon_max.cgi	2008-08-08 02:13:10 UTC (rev 991)
@@ -15,7 +15,7 @@
              popcon_src_max
         WHERE NOT EXISTS (SELECT * FROM sources WHERE distribution = 'debian'
                           AND release = 'lenny' and package = unstable.package)
-              AND popcon_src_max.package = unstable.package AND popcon_src_max.distribution = 'debian' ORDER BY insts DESC;
+              AND popcon_src_max.source = unstable.package AND popcon_src_max.distribution = 'debian' ORDER BY insts DESC;
 EOF
 	);