From 14213c4c276601271838bb53ef49c2ec2f0c6ed4 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Wed, 24 Jun 2020 22:55:11 +0200
Subject: [PATCH] Allow some solr query options in the config file

---
 .../scala/docspell/ftssolr/QueryData.scala    | 16 ++++++-
 .../scala/docspell/ftssolr/SolrConfig.scala   |  8 +++-
 .../scala/docspell/ftssolr/SolrQuery.scala    | 48 ++++++++++---------
 .../joex/src/main/resources/reference.conf    |  6 +++
 .../src/main/resources/reference.conf         |  7 ++-
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/QueryData.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/QueryData.scala
index a88736bf..063f3048 100644
--- a/modules/fts-solr/src/main/scala/docspell/ftssolr/QueryData.scala
+++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/QueryData.scala
@@ -33,7 +33,12 @@ object QueryData {
   implicit val jsonEncoder: Encoder[QueryData] =
     deriveEncoder[QueryData]
 
-  def apply(search: List[Field], fields: List[Field], fq: FtsQuery): QueryData = {
+  def apply(
+      cfg: SolrConfig,
+      search: List[Field],
+      fields: List[Field],
+      fq: FtsQuery
+  ): QueryData = {
     val q     = sanitize(fq.q)
     val extQ  = search.map(f => s"${f.name}:($q)").mkString(" OR ")
     val items = fq.items.map(_.id).mkString(" ")
@@ -44,7 +49,14 @@ object QueryData {
       case _ =>
         (collQ :: List(s"""${Field.itemId.name}:($items)""")).mkString(" AND ")
     }
-    QueryData(extQ, filterQ, fq.limit, fq.offset, fields, Map.empty).withHighLight(
+    QueryData(
+      extQ,
+      filterQ,
+      fq.limit,
+      fq.offset,
+      fields,
+      Map("defType" -> cfg.defType, "q.op" -> cfg.qOp)
+    ).withHighLight(
       search,
       fq.highlight.pre,
       fq.highlight.post
diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrConfig.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrConfig.scala
index f2a04d64..639ae424 100644
--- a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrConfig.scala
+++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrConfig.scala
@@ -2,6 +2,12 @@ package docspell.ftssolr
 
 import docspell.common._
 
-final case class SolrConfig(url: LenientUri, commitWithin: Int, logVerbose: Boolean)
+final case class SolrConfig(
+    url: LenientUri,
+    commitWithin: Int,
+    logVerbose: Boolean,
+    defType: String,
+    qOp: String
+)
 
 object SolrConfig {}
diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrQuery.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrQuery.scala
index 69a893d7..c557344d 100644
--- a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrQuery.scala
+++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrQuery.scala
@@ -15,29 +15,7 @@ trait SolrQuery[F[_]] {
 
   def query(q: QueryData): F[FtsResult]
 
-  def query(q: FtsQuery): F[FtsResult] = {
-    val fq = QueryData(
-      List(
-        Field.content,
-        Field.content_de,
-        Field.content_en,
-        Field.itemName,
-        Field.itemNotes,
-        Field.attachmentName
-      ),
-      List(
-        Field.id,
-        Field.itemId,
-        Field.collectiveId,
-        Field("score"),
-        Field.attachmentId,
-        Field.attachmentName,
-        Field.discriminator
-      ),
-      q
-    )
-    query(fq)
-  }
+  def query(q: FtsQuery): F[FtsResult]
 }
 
 object SolrQuery {
@@ -53,6 +31,30 @@ object SolrQuery {
         client.expect[FtsResult](req)
       }
 
+      def query(q: FtsQuery): F[FtsResult] = {
+        val fq = QueryData(
+          cfg,
+          List(
+            Field.content,
+            Field.content_de,
+            Field.content_en,
+            Field.itemName,
+            Field.itemNotes,
+            Field.attachmentName
+          ),
+          List(
+            Field.id,
+            Field.itemId,
+            Field.collectiveId,
+            Field("score"),
+            Field.attachmentId,
+            Field.attachmentName,
+            Field.discriminator
+          ),
+          q
+        )
+        query(fq)
+      }
     }
   }
 }
diff --git a/modules/joex/src/main/resources/reference.conf b/modules/joex/src/main/resources/reference.conf
index 524f5735..16bc791a 100644
--- a/modules/joex/src/main/resources/reference.conf
+++ b/modules/joex/src/main/resources/reference.conf
@@ -382,6 +382,12 @@ docspell.joex {
       commit-within = 1000
       # If true, logs request and response bodies
       log-verbose = false
+      # The defType parameter to lucene that defines the parser to
+      # use. You might want to try "edismax" or look here:
+      # https://lucene.apache.org/solr/guide/8_4/query-syntax-and-parsing.html#query-syntax-and-parsing
+      def-type = "lucene"
+      # The default combiner for tokens. One of {AND, OR}.
+      q-op = "OR"
     }
 
     # Settings for running the index migration tasks
diff --git a/modules/restserver/src/main/resources/reference.conf b/modules/restserver/src/main/resources/reference.conf
index 23954f8a..1142c2cb 100644
--- a/modules/restserver/src/main/resources/reference.conf
+++ b/modules/restserver/src/main/resources/reference.conf
@@ -109,8 +109,13 @@ docspell.server {
       commit-within = 1000
       # If true, logs request and response bodies
       log-verbose = false
+      # The defType parameter to lucene that defines the parser to
+      # use. You might want to try "edismax" or look here:
+      # https://lucene.apache.org/solr/guide/8_4/query-syntax-and-parsing.html#query-syntax-and-parsing
+      def-type = "lucene"
+      # The default combiner for tokens. One of {AND, OR}.
+      q-op = "OR"
     }
-
   }
 
   # Configuration for the backend.