Merge lp:~jml/launchpad/legacy-vcs-imports into lp:launchpad

[Jonathan Lange]

[Jonathan Lange (jml)]

This branch removes code from ProductSeries that was only used by legacy vcs-imports code. Best reviewed with https://code.edge.launchpad.net/~jml/launchpad/remove-vcs-imports/+merge/10899

[Michael Hudson-Doyle (mwhudson)]

Looks like something I forgot to delete about 6 months ago :)

review: Approve

=== modified file 'lib/lp/registry/model/productseries.py'
--- lib/lp/registry/model/productseries.py	2009-08-24 03:18:41 +0000
+++ lib/lp/registry/model/productseries.py	2009-08-30 01:45:18 +0000
@@ -594,46 +594,6 @@
         except SQLObjectNotFound:
             return default
 
-    def composeQueryString(self, text=None, importstatus=None):
-        """Build SQL "where" clause for `ProductSeries` search.
-
-        :param text: Text to search for in the product and project titles and
-            descriptions.
-        :param importstatus: If specified, limit the list to series which have
-            the given import status; if not specified or None, limit to series
-            with non-NULL import status.
-        """
-        conditions = ["ProductSeries.product = Product.id"]
-        if text == u'':
-            text = None
-
-        # First filter on text, if supplied.
-        if text is not None:
-            conditions.append("""
-                ((Project.fti @@ ftq(%s) AND Product.project IS NOT NULL) OR
-                Product.fti @@ ftq(%s))""" % (quote(text), quote(text)))
-
-        # Exclude deactivated products.
-        conditions.append('Product.active IS TRUE')
-
-        # Exclude deactivated projects, too.
-        conditions.append(
-            "((Product.project = Project.id AND Project.active) OR"
-            " Product.project IS NULL)")
-
-        # Now just add the filter on import status.
-        if importstatus is None:
-            conditions.append('ProductSeries.importstatus IS NOT NULL')
-        else:
-            conditions.append('ProductSeries.importstatus = %s'
-                              % sqlvalues(importstatus))
-
-        # And build the query.
-        query = " AND ".join(conditions)
-        return """productseries.id IN
-            (SELECT productseries.id FROM productseries, product, project
-             WHERE %s) AND productseries.product = product.id""" % query
-
     def getSeriesForBranches(self, branches):
         """See `IProductSeriesSet`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)