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

[neronus-guest at alioth.debian.org]

Author: neronus-guest
Date: 2008-07-28 16:32:56 +0000 (Mon, 28 Jul 2008)
New Revision: 965

Modified:
   udd/src/setup-db.sql
   udd/src/test.yaml
   udd/src/udd/popcon_gatherer.py
Log:
Renamed popcon.name to popcon.package
Renamed testing_migrations.package to testing_migrations.source


Modified: udd/src/setup-db.sql
===================================================================
--- udd/src/setup-db.sql	2008-07-28 16:18:53 UTC (rev 964)
+++ udd/src/setup-db.sql	2008-07-28 16:32:56 UTC (rev 965)
@@ -18,12 +18,12 @@
     PRIMARY KEY (package, version, distribution, release, component));
 
 CREATE TABLE migrations
-  (package text PRIMARY KEY, in_testing date, testing_version text, in_unstable date, unstable_version text, sync date, sync_version text, first_seen date);
+  (source text PRIMARY KEY, in_testing date, testing_version text, in_unstable date, unstable_version text, sync date, sync_version text, first_seen date);
 
 CREATE TABLE popcon (
-   Name text, insts int, vote int, olde int, recent int, nofiles int,
+   package text, insts int, vote int, olde int, recent int, nofiles int,
    distribution text,
-   PRIMARY KEY (Name, distribution));
+   PRIMARY KEY (package, distribution));
 
 CREATE TABLE bugs
   (id int PRIMARY KEY, package text, source text, arrival timestamp, status text,
@@ -52,20 +52,20 @@
   maintainer text, nmu boolean, signed_by text, key_id text);
 
 CREATE VIEW popcon_src_average AS
-  SELECT 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.package, 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.name = packages.package AND
+	  popcon.package = packages.package AND
 	  popcon.distribution = packages.distribution
     GROUP BY packages.source, packages.distribution, packages.package;
 
 CREATE VIEW popcon_src_max AS
-  SELECT 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.package, 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.name = packages.package AND
+	  popcon.package = packages.package AND
 	  popcon.distribution = packages.distribution
     GROUP BY packages.source, packages.distribution, packages.package;
 

Modified: udd/src/test.yaml
===================================================================
--- udd/src/test.yaml	2008-07-28 16:18:53 UTC (rev 964)
+++ udd/src/test.yaml	2008-07-28 16:32:56 UTC (rev 965)
@@ -117,14 +117,14 @@
 
 debian-popcon:
   type: popcon
-  path: /tmp/all-popcon-results.txt.gz
-  update-command: wget -O /tmp/all-popcon-results.txt.gz http://popcon.debian.org/all-popcon-results.txt.gz
+  path: ./all-popcon-results.txt.gz
+  update-command: wget -O ./all-popcon-results.txt.gz http://popcon.debian.org/all-popcon-results.txt.gz
   distribution: debian
   
 ubuntu-popcon:
   type: popcon
-  path: /tmp/ubuntu-popcon-results.txt.gz
-  update-command: wget -O /tmp/ubuntu-popcon-results.txt.gz http://popcon.ubuntu.com/all-popcon-results.txt.gz
+  path: /tmp/udd-test/ubuntu-popcon-results.txt.gz
+  update-command: wget -O /tmp/udd-test/ubuntu-popcon-results.txt.gz http://popcon.ubuntu.com/all-popcon-results.txt.gz
   distribution: ubuntu
 
 testing-migrations:

Modified: udd/src/udd/popcon_gatherer.py
===================================================================
--- udd/src/udd/popcon_gatherer.py	2008-07-28 16:18:53 UTC (rev 964)
+++ udd/src/udd/popcon_gatherer.py	2008-07-28 16:32:56 UTC (rev 965)
@@ -32,7 +32,7 @@
 
     cur = self.cursor()
 
-    cur.execute("PREPARE pop_insert AS INSERT INTO popcon (name, insts, vote, olde, recent, nofiles, distribution) VALUES ($1, $2, $3, $4, $5, $6, '%s')" % my_config['distribution'])
+    cur.execute("PREPARE pop_insert AS INSERT INTO popcon (package, insts, vote, olde, recent, nofiles, distribution) VALUES ($1, $2, $3, $4, $5, $6, '%s')" % my_config['distribution'])
 
     popcon = gzip.open(my_config['path'])
 
@@ -46,7 +46,7 @@
       linenr += 1
       name, data = line.split(None, 1)
       if name == "Submissions:":
-	cur.execute("INSERT INTO popcon (name, vote, distribution) VALUES ('_submissions', %s, '%s')" % (data, my_config['distribution']))
+	cur.execute("INSERT INTO popcon (package, vote, distribution) VALUES ('_submissions', %s, '%s')" % (data, my_config['distribution']))
       try:
 	(name, vote, old, recent, nofiles) = data.split()
 	if ascii_match.match(name) == None: