Merge lp:~mvo/software-center/fix-index-update-terms-bug into lp:software-center

[Michael Vogt]

This fixes the default value of the self.FIELD_TO_TERMS.get() call to
return a empty list as we do not want to add the key split up in chars
as terms

[lp:~mvo/software-center/fix-index-update-terms-bug]

3114. By Michael Vogt on 2012-08-22

add regression test

3115. By Michael Vogt on 2012-08-22

tests/test_database.py: remove import of AppInfoParserBase, we don't need it

3116. By Michael Vogt on 2012-08-22

tests/test_database.py: remove string imprt that we don't really need

[James Westby (james-w)]

review: Approve

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-08-01 04:37:06 +0000
+++ softwarecenter/db/update.py	2012-08-22 09:06:20 +0000
@@ -239,7 +239,7 @@
                 doc_key = self.FIELD_TO_XAPIAN[key]
                 doc.add_value(doc_key, value)
                 # add terms to the xapian database
-                get_terms = self.FIELD_TO_TERMS.get(key, lambda i: i)
+                get_terms = self.FIELD_TO_TERMS.get(key, lambda i: [])
                 for t in get_terms(value):
                     doc.add_term(t)
 

=== modified file 'tests/test_database.py'
--- tests/test_database.py	2012-08-22 08:57:57 +0000
+++ tests/test_database.py	2012-08-22 09:06:20 +0000
@@ -92,6 +92,22 @@
             i+=1
         self.assertEqual(i, 1)
 
+    def test_regression_index_terms(self):
+        """ this tests for a regression that we had in the term indexer
+            that would index hundrets of size 1 terms due to a bug
+            in AppInfoParserBase._set_doc_from_key
+        """
+        db = xapian.WritableDatabase(TEST_DB,
+                                     xapian.DB_CREATE_OR_OVERWRITE)
+        update_from_app_install_data(db, self.cache,
+            datadir=os.path.join(DATA_DIR, "desktop"))
+        for it in db.postlist("APsoftware-center"):
+            docid = it.docid
+            break
+        # this is the important part, ensure no signle char terms
+        for t in db.termlist(docid):
+            self.assertFalse(len(t.term) == 1)
+
     def test_update_from_appstream_xml(self):
         db = xapian.WritableDatabase(TEST_DB,
                                      xapian.DB_CREATE_OR_OVERWRITE)