Change the default search mode such that packages that contain all of
the space-separated search terms are returned. For example, the query

    image edit "command line"

returns all packages where "image", "edit" and "command line" occurs in
the package name or description. This is much more convenient and
general than a simple substring search (one can still perform a
substring search by quoting the whole search term).

Signed-off-by: Lukas Fleischer <[email protected]>
---
 web/lib/pkgfuncs.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index c71358a..8fd629f 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -601,9 +601,11 @@ function pkg_search_page($SID="") {
                }
                else {
                        /* Search by name and description (default). */
-                       $K = "%" . addcslashes($_GET['K'], '%_') . "%";
-                       $q_where .= "AND (Packages.Name LIKE " . 
$dbh->quote($K) . " OR ";
-                       $q_where .= "Description LIKE " . $dbh->quote($K) . ") 
";
+                       foreach (str_getcsv($_GET['K'], ' ') as $term) {
+                               $term = "%" . addcslashes($term, '%_') . "%";
+                               $q_where .= "AND (Packages.Name LIKE " . 
$dbh->quote($term) . " OR ";
+                               $q_where .= "Description LIKE " . 
$dbh->quote($term) . ") ";
+                       }
                }
        }
 
-- 
2.4.1

Reply via email to