WIP

Author: jnatten

search-api/src/main/scala/no/ndla/searchapi/service/search/MultiDraftSearchService.scala

@@ -159,7 +159,7 @@ trait MultiDraftSearchService {
 
         boolQuery().should(
           List(
-            langQueryFunc("title", 3),
+            langQueryFunc("title", 20),
             langQueryFunc("introduction", 2),
             langQueryFunc("metaDescription", 1),
             langQueryFunc("content", 1),

search-api/src/main/scala/no/ndla/searchapi/service/search/MultiSearchService.scala

@@ -70,18 +70,21 @@ trait MultiSearchService {
         boolQuery().must(
           boolQuery().should(
             List(
-              langQueryFunc("title", 6),
-              langQueryFunc("introduction", 2),
-              langQueryFunc("metaDescription", 1),
-              langQueryFunc("content", 1),
-              langQueryFunc("tags", 1),
-              langQueryFunc("embedAttributes", 1),
-              simpleStringQuery(q.underlying).field("authors", 1),
-              simpleStringQuery(q.underlying).field("grepContexts.title", 1),
-              nestedQuery("contexts", boolQuery().should(termQuery("contexts.contextId", q.underlying))),
-              termQuery("contextids", q.underlying),
-              idsQuery(q.underlying)
-            ) ++
+              buildMatchQueryForField(q, "title", settings.language, settings.fallback, 20)
+            ).flatten ++
+              List(
+                langQueryFunc("title", 20),
+                langQueryFunc("introduction", 2),
+                langQueryFunc("metaDescription", 1),
+                langQueryFunc("content", 1),
+                langQueryFunc("tags", 1),
+                langQueryFunc("embedAttributes", 1),
+                simpleStringQuery(q.underlying).field("authors", 1),
+                simpleStringQuery(q.underlying).field("grepContexts.title", 1),
+                nestedQuery("contexts", boolQuery().should(termQuery("contexts.contextId", q.underlying))),
+                termQuery("contextids", q.underlying),
+                idsQuery(q.underlying)
+              ) ++
               buildNestedEmbedField(List(q.underlying), None, settings.language, settings.fallback) ++
               buildNestedEmbedField(List.empty, Some(q.underlying), settings.language, settings.fallback)
           )
@@ -90,17 +93,26 @@ trait MultiSearchService {
 
       val nodeSearch = settings.query.map { q =>
         val langQueryFunc = (fieldName: String, boost: Double) =>
-          buildSimpleStringQueryForField(
-            q,
-            fieldName,
-            boost,
-            settings.language,
-            settings.fallback,
-            searchDecompounded = true
-          )
+          List(
+            buildSimpleStringQueryForField(
+              q,
+              fieldName,
+              boost,
+              settings.language,
+              settings.fallback,
+              searchDecompounded = true
+            ).some,
+            buildMatchQueryForField(
+              q,
+              fieldName,
+              settings.language,
+              settings.fallback,
+              boost
+            )
+          ).flatten
         boolQuery().must(
           boolQuery().should(
-            langQueryFunc("title", 18)
+            langQueryFunc("title", 100)
           )
         )
       }

search-api/src/main/scala/no/ndla/searchapi/service/search/SearchService.scala

@@ -77,8 +77,48 @@ trait SearchService {
       }
     }
 
-    def languageQuery(query: NonEmptyString, field: String, boost: Double, language: String): SimpleStringQuery =
-      buildSimpleStringQueryForField(query, field, boost, language, fallback = true, searchDecompounded = true)
+    def languageQuery(query: NonEmptyString, field: String, boost: Double, language: String): List[Query] =
+      List(
+        buildSimpleStringQueryForField(query, field, boost, language, fallback = true, searchDecompounded = true).some,
+        buildMatchQueryForField(query, field, language, fallback = true, boost)
+      ).flatten
+
+    def buildMatchQueryForField(
+        query: NonEmptyString,
+        field: String,
+        language: String,
+        fallback: Boolean,
+        boost: Double
+    ): List[Query] = {
+      val skipChars = List("+", "|", "-", "\"","*", "(", ")", "~")
+      if(skipChars.exists(query.underlying.contains)) return List.empty
+
+      val searchLanguage = language match {
+        case lang if Iso639.get(lang).isSuccess => lang
+        case _                                  => Language.AllLanguages
+      }
+      val matchQueries = if (searchLanguage == Language.AllLanguages || fallback) {
+        SearchLanguage.languageAnalyzers.map{cur =>
+          matchPhrasePrefixQuery(s"$field.${cur.languageTag.toString}", query.underlying).boost(boost)
+        }.toList
+      } else {
+        List(matchPhrasePrefixQuery(s"$field.$language", query.underlying).boost(boost))
+      }
+
+      val termQueries = if (searchLanguage == Language.AllLanguages || fallback) {
+        SearchLanguage.languageAnalyzers.map{cur =>
+          prefixQuery(s"$field.${cur.languageTag.toString}", query.underlying).boost(boost)
+        }.toList
+      } else {
+        List(prefixQuery(s"$field.$language", query.underlying).boost(boost))
+      }
+
+
+      List(
+        matchQueries,
+        termQueries
+      ).flatten
+    }
 
     def buildSimpleStringQueryForField(
         query: NonEmptyString,

search-api/src/test/scala/no/ndla/searchapi/service/search/MultiSearchServiceTest.scala

@@ -727,16 +727,16 @@ class MultiSearchServiceTest
         searchSettings.copy(query = Some(NonEmptyString.fromString("Helse søster").get), language = AllLanguages)
       )
 
-    search1.totalCount should be(1)
     search1.summaryResults.map(_.id) should be(Seq(12))
+    search1.totalCount should be(1)
 
     val Success(search2) =
       multiSearchService.matchingQuery(
         searchSettings.copy(query = Some(NonEmptyString.fromString("Helse søster").get), language = "nb")
       )
 
-    search2.totalCount should be(1)
     search2.summaryResults.map(_.id) should be(Seq(12))
+    search2.totalCount should be(1)
   }
 
   test("That filterByNoResourceType works by filtering out every document that does not have resourceTypes") {