[Collab-qa-commits] r1373 - in udd: sql udd

[lucas at alioth.debian.org]

Author: lucas
Date: 2009-01-07 20:55:35 +0000 (Wed, 07 Jan 2009)
New Revision: 1373

Modified:
   udd/sql/setup.sql
   udd/sql/upgrade.sql
   udd/udd/packages_gatherer.py
Log:
added long_description column to packages table

Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2009-01-06 15:15:47 UTC (rev 1372)
+++ udd/sql/setup.sql	2009-01-07 20:55:35 UTC (rev 1373)
@@ -29,7 +29,7 @@
 
 CREATE TABLE packages
   (package text, version text, architecture text, maintainer text, description
-    text, source text, source_version text, essential text, depends text,
+    text, long_description text, source text, source_version text, essential text, depends text,
     recommends text, suggests text, enhances text, pre_depends text, breaks text,
     installed_size int, homepage text, size int,
     build_essential text, origin text, sha1 text, replaces text, section text,
@@ -75,7 +75,7 @@
 
 CREATE TABLE ubuntu_packages
   (package text, version text, architecture text, maintainer text, description
-    text, source text, source_version text, essential text, depends text,
+    text, long_description text, source text, source_version text, essential text, depends text,
     recommends text, suggests text, enhances text, pre_depends text, breaks text,
     installed_size int, homepage text, size int,
     build_essential text, origin text, sha1 text, replaces text, section text,

Modified: udd/sql/upgrade.sql
===================================================================
--- udd/sql/upgrade.sql	2009-01-06 15:15:47 UTC (rev 1372)
+++ udd/sql/upgrade.sql	2009-01-07 20:55:35 UTC (rev 1373)
@@ -26,3 +26,6 @@
 -- 2008-12-19: add breaks column in packages
 ALTER TABLE packages add breaks text;
 ALTER TABLE ubuntu_packages add breaks text;
+-- 2009-01-07: add long_description column
+ALTER TABLE packages add long_description text;
+ALTER TABLE ubuntu_packages add long_description text;

Modified: udd/udd/packages_gatherer.py
===================================================================
--- udd/udd/packages_gatherer.py	2009-01-06 15:15:47 UTC (rev 1372)
+++ udd/udd/packages_gatherer.py	2009-01-07 20:55:35 UTC (rev 1373)
@@ -93,6 +93,10 @@
       # We just use the first line of the description
       if 'Description' in d:
 	d['Description'] = d['Description'].split("\n",1)[0]
+	if len(d['Description'].split("\n",1)) > 1:
+	  d['Long_Description'] = d['Description'].split("\n",1)[1]
+	else:
+	  d['Long_Description'] = ''
 
       # Convert numbers to numbers
       for f in ['Installed-Size', 'Size']:
@@ -113,7 +117,7 @@
 
       query = """EXECUTE package_insert
 	  (%(Package)s, %(Version)s, %(Architecture)s, %(Maintainer)s,
-	  %(Description)s, %(Source)s, %(Source_Version)s, %(Essential)s,
+	  %(Description)s, %(Long_Description)s, %(Source)s, %(Source_Version)s, %(Essential)s,
 	  %(Depends)s, %(Recommends)s, %(Suggests)s, %(Enhances)s,
 	  %(Pre-Depends)s, %(Breaks)s, %(Installed-Size)s, %(Homepage)s, %(Size)s,
 	  %(Build-Essential)s, %(Origin)s, %(SHA1)s,
@@ -163,7 +167,7 @@
 	path = os.path.join(src_cfg['directory'], comp, 'binary-' + arch, 'Packages.gz')
 	try:
 	  cur.execute("""PREPARE package_insert AS INSERT INTO %s
-	    (Package, Version, Architecture, Maintainer, Description, Source,
+	    (Package, Version, Architecture, Maintainer, Description, Long_Description, Source,
 	    Source_Version, Essential, Depends, Recommends, Suggests, Enhances,
 	    Pre_Depends, Breaks, Installed_Size, Homepage, Size,
 	    build_essential, origin, sha1, replaces, section,
@@ -173,7 +177,7 @@
 	  VALUES
 	    ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
 	      $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28,
-	      $29, $30, $31, $32, '%s', '%s', '%s')
+	      $29, $30, $31, $32, $33, '%s', '%s', '%s')
 	    """ %  (table, self._distr, src_cfg['release'], comp))
 #	  aux.print_debug("Reading file " + path)
 	  # Copy content from gzipped file to temporary file, so that apt_pkg is