From: Michael Tremer Date: Mon, 11 Dec 2017 18:21:03 +0000 (+0000) Subject: packages: Make search work X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8d72179e8ff385c60bfd38d1811964a487f5c81;p=pbs.git packages: Make search work This returns all packages now instead of a unique list Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py index de9ce1ae..a322dd61 100644 --- a/src/buildservice/packages.py +++ b/src/buildservice/packages.py @@ -133,28 +133,13 @@ class Packages(base.Object): This function does not work for UUIDs or filenames. """ - query = "SELECT * FROM packages \ - WHERE type = %s AND ( \ - name LIKE %s OR \ - summary LIKE %s OR \ - description LIKE %s \ - ) \ - GROUP BY name" - pattern = "%%%s%%" % pattern - args = ("source", pattern, pattern, pattern) - - res = self.db.query(query, *args) - - pkgs = [] - for row in res: - pkg = Package(self.backend, row.id, row) - pkgs.append(pkg) - if limit and len(pkgs) >= limit: - break + packages = self._get_packages("SELECT * FROM packages \ + WHERE type = %s AND (name LIKE %s OR summary LIKE %s OR description LIKE %s)", + "source", pattern, pattern, pattern) - return pkgs + return list(packages) def search_by_filename(self, filename, limit=None): query = "SELECT filelists.* FROM filelists \