[Collab-qa-commits] r2237 - in udd: . sql udd

[Iain Lane]

Author: laney
Date: 2012-04-22 11:04:54 +0000 (Sun, 22 Apr 2012)
New Revision: 2237

Modified:
   udd/config-org.yaml
   udd/sql/setup.sql
   udd/udd/ddtp_gatherer.py
Log:
Import Ubuntu ddtp data



Modified: udd/config-org.yaml
===================================================================
--- udd/config-org.yaml	2012-04-22 09:52:46 UTC (rev 2236)
+++ udd/config-org.yaml	2012-04-22 11:04:54 UTC (rev 2237)
@@ -998,6 +998,17 @@
    imports-table: description_imports
    schema: ddtp
 
+ubuntu-ddtp:
+   type: ddtp
+   update-command: /org/udd.debian.org/udd/scripts/fetch_ddtp_translations.sh /org/udd.debian.org/mirrors/ubuntu-ddtp /org/mirrors/ubuntu.com/dists
+   path: /org/udd.debian.org/mirrors/ubuntu-ddtp
+   files: Translation-.*\.gz
+   mirrorpath: /org/mirrors/ubuntu.com/ftp/dists
+   descriptions-table: ubuntu_descriptions
+   imports-table: ubuntu_description_imports
+   schema: ddtp
+   distribution: ubuntu
+
 ftpnew:
   type: ftpnew
   update-command: /org/udd.debian.org/udd/scripts/fetch_ftpnew.sh

Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2012-04-22 09:52:46 UTC (rev 2236)
+++ udd/sql/setup.sql	2012-04-22 11:04:54 UTC (rev 2237)
@@ -654,6 +654,17 @@
     PRIMARY KEY (distribution, release, component, language)
 );
 
+CREATE TABLE ubuntu_description_imports (
+    distribution         text not null,
+    release              text not null,
+    component            text not null,
+    language             text not null,
+    translationfile      text not null,
+    translationfile_sha1 text not null,
+    import_date          timestamp default now(),
+    PRIMARY KEY (distribution, release, component, language)
+);
+
 -- active_dds view
 CREATE VIEW active_dds AS
 SELECT DISTINCT carnivore_login.id, login

Modified: udd/udd/ddtp_gatherer.py
===================================================================
--- udd/udd/ddtp_gatherer.py	2012-04-22 09:52:46 UTC (rev 2236)
+++ udd/udd/ddtp_gatherer.py	2012-04-22 11:04:54 UTC (rev 2237)
@@ -79,7 +79,7 @@
     #        as long as backports and security does not contain i18n files
     #        The right way to go would be to read the config file again fo
     #        each release below
-    self._distr = 'debian'
+    self._distr = src_cfg.get('disribution', 'debian')
 
     cur = self.cursor()
     query = """PREPARE ddtp_check_previous_import (text, text, text) AS