use SimpleQueryString search

Signed-off-by: Michael Barz <[email protected]>
owncloud · Sep 6, 2021 · f4c2866 · f4c2866
1 parent 7103663
commit f4c2866
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/.drone.star b/.drone.star
@@ -310,7 +310,7 @@ def phpstan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.3"],
+        "phpVersions": ["7.4"],
         "logLevel": "2",
         "extraApps": {},
         "enableApp": True,

diff --git a/lib/Search/ElasticSearchProvider.php b/lib/Search/ElasticSearchProvider.php
@@ -175,12 +175,12 @@ public function fetchResults($query, $size, $page) {
 
 		$es_bool = new BoolQuery();
 		$es_bool->addFilter($es_filter);
-		// wildcard queries are not analyzed, so ignore case. See http://stackoverflow.com/a/17280591
-		$loweredQuery = \strtolower($query);
 		if ($searchContent) {
-			$es_bool->addShould(new Query\MatchPhrasePrefix('file.content', $loweredQuery));
+			$es_content_query = new Query\SimpleQueryString($query, ['file.content']);
+			$es_content_query->setParam('analyze_wildcard', true);
+			$es_bool->addShould($es_content_query);
 		}
-		$es_bool->addShould(new Query\MatchPhrasePrefix('name', $loweredQuery));
+		$es_bool->addShould(new Query\SimpleQueryString($query, ['name']));
 		$es_bool->setMinimumShouldMatch(1);
 
 		$es_query = new Query($es_bool);

diff --git a/tests/acceptance/features/webUISearchElastic/searchContent.feature b/tests/acceptance/features/webUISearchElastic/searchContent.feature
@@ -30,20 +30,38 @@ Feature: Search
       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
       """
 
+  Scenario: Search content only more than one word
+    When the user searches for "lorem ipsum sit" using the webUI
+    Then file "lorem.txt" with path "/simple-folder" should be listed in the search results in the other folders section on the webUI with highlights containing:
+      """
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
+      """
+
+  Scenario: Search content only (exact match)
+    When the user searches for "query" using the webUI
+      """
+      "lorem ipsum sit"
+      """
+    Then file "lorem.txt" with path "/simple-folder" should not be listed in the search results in the other folders section on the webUI
+
   Scenario: Search content only (not exact case)
     When the user searches for "iPsUM" using the webUI
     Then file "lorem.txt" with path "/simple-folder" should be listed in the search results in the other folders section on the webUI with highlights containing:
       """
       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
       """
 
-  Scenario: Search content only (not full word - end of word missing)
-    When the user searches for "ipsu" using the webUI
+  Scenario: Search content only (not full word - wildcard used)
+    When the user searches for "ipsu*" using the webUI
     Then file "lorem.txt" with path "/simple-folder" should be listed in the search results in the other folders section on the webUI with highlights containing:
       """
       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
       """
 
+  Scenario: Search content only (not full word - end of word missing)
+    When the user searches for "ipsu" using the webUI
+    Then file "lorem.txt" with path "/simple-folder" should not be listed in the search results in the other folders section on the webUI
+
   @issue-38
   Scenario: Search content only (not full word - start of word missing)
     When the user searches for "psum" using the webUI