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

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-08-08 20:26:09 +0000 (Fri, 08 Aug 2008)
New Revision: 1018

Modified:
   udd/src/db_manager.py
   udd/src/setup-db.sql
   udd/web/cgi-bin/removal_candidates.cgi
   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:
renamed popcon_src_max to popcon_src

Modified: udd/src/db_manager.py
===================================================================
--- udd/src/db_manager.py	2008-08-08 20:22:58 UTC (rev 1017)
+++ udd/src/db_manager.py	2008-08-08 20:26:09 UTC (rev 1018)
@@ -6,8 +6,8 @@
 
 """This scripts sets up and deletes the tables of the database"""
 
-TABLES = ('popcon_src_average', 'popcon_src_max', 'popcon',
-    'ubuntu_popcon_src_average', 'ubuntu_popcon_src_max', 'ubuntu_popcon',
+TABLES = ('popcon_src_average', 'popcon_src', 'popcon',
+    'ubuntu_popcon_src_average', 'ubuntu_popcon_src', 'ubuntu_popcon',
     'sources', 'packages', 'ubuntu_sources', 'ubuntu_packages', 'migrations',
     'bugs_archived', 'bugs_unarchived', 'bug_merged_with', 'bug_user_tags',
     'bug_found_in', 'bug_fixed_in', 'bug_tags', 'upload_history')

Modified: udd/src/setup-db.sql
===================================================================
--- udd/src/setup-db.sql	2008-08-08 20:22:58 UTC (rev 1017)
+++ udd/src/setup-db.sql	2008-08-08 20:26:09 UTC (rev 1018)
@@ -49,7 +49,7 @@
    package text, insts int, vote int, olde int, recent int, nofiles int,
    PRIMARY KEY (package));
  
-CREATE TABLE popcon_src_max (
+CREATE TABLE popcon_src (
    source text, insts int, vote int, olde int, recent int, nofiles int,
    PRIMARY KEY (source));
 
@@ -61,7 +61,7 @@
    package text, insts int, vote int, olde int, recent int, nofiles int,
    PRIMARY KEY (package));
  
-CREATE TABLE ubuntu_popcon_src_max (
+CREATE TABLE ubuntu_popcon_src (
    source text, insts int, vote int, olde int, recent int, nofiles int,
    PRIMARY KEY (source));
 
@@ -128,10 +128,10 @@
 GRANT SELECT ON ubuntu_sources TO PUBLIC;
 GRANT SELECT ON popcon TO PUBLIC;
 GRANT SELECT ON popcon_src_average TO PUBLIC;
-GRANT SELECT ON popcon_src_max TO PUBLIC;
+GRANT SELECT ON popcon_src TO PUBLIC;
 GRANT SELECT ON ubuntu_popcon TO PUBLIC;
 GRANT SELECT ON ubuntu_popcon_src_average TO PUBLIC;
-GRANT SELECT ON ubuntu_popcon_src_max TO PUBLIC;
+GRANT SELECT ON ubuntu_popcon_src TO PUBLIC;
 GRANT SELECT ON bugs TO PUBLIC;
 GRANT SELECT ON bugs_archived TO PUBLIC;
 GRANT SELECt ON bugs_unarchived TO PUBLIC;

Modified: udd/web/cgi-bin/removal_candidates.cgi
===================================================================
--- udd/web/cgi-bin/removal_candidates.cgi	2008-08-08 20:22:58 UTC (rev 1017)
+++ udd/web/cgi-bin/removal_candidates.cgi	2008-08-08 20:26:09 UTC (rev 1018)
@@ -8,15 +8,15 @@
 
 my $s = <<EOF
 select sources.package, id, insts, arrival, last_modified, title
-from sources, bugs_unarchived AS bugs, popcon_src_max
+from sources, bugs_unarchived AS bugs, popcon_src
 where sources.distribution = 'debian' and sources.release = 'lenny'
 and bugs.source = sources.package
 and bugs.affects_testing = true
 and bugs.affects_unstable = true
 and bugs.severity in ('serious', 'grave', 'critical')
 and arrival < (NOW() - interval '14 DAYS')
-and sources.package = popcon_src_max.source
-and popcon_src_max.insts < 2000
+and sources.package = popcon_src.source
+and popcon_src.insts < 2000
 order by package;
 EOF
 ;

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 20:22:58 UTC (rev 1017)
+++ udd/web/cgi-bin/sources_in_ubuntu_but_not_in_debian_by_popcon.cgi	2008-08-08 20:26:09 UTC (rev 1018)
@@ -12,10 +12,10 @@
         FROM (SELECT DISTINCT package FROM ubuntu_sources
                 WHERE release = 'intrepid')
           AS intrepid,
-             ubuntu_popcon_src_max
+             ubuntu_popcon_src
         WHERE NOT EXISTS (SELECT * FROM sources WHERE distribution = 'debian'
                           and package = intrepid.package)
-              AND ubuntu_popcon_src_max.source = intrepid.package ORDER BY insts DESC;
+              AND ubuntu_popcon_src.source = intrepid.package 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 20:22:58 UTC (rev 1017)
+++ udd/web/cgi-bin/sources_in_unstable_but_not_in_testing_by_popcon_max.cgi	2008-08-08 20:26:09 UTC (rev 1018)
@@ -12,10 +12,10 @@
         FROM (SELECT DISTINCT package FROM sources
                 WHERE distribution = 'debian' and release = 'sid')
           AS unstable,
-             popcon_src_max
+             popcon_src
         WHERE NOT EXISTS (SELECT * FROM sources WHERE distribution = 'debian'
                           AND release = 'lenny' and package = unstable.package)
-              AND popcon_src_max.source = unstable.package ORDER BY insts DESC;
+              AND popcon_src.source = unstable.package ORDER BY insts DESC;
 EOF
 	);