Improve compatibility w/ Solr 7

Added `op` and `df` to default query params

.editorconfig

@@ -0,0 +1,15 @@
+# https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+# 2 space indentation
+[*.{scala,js}]
+indent_style = space
+indent_size = 2

.gitignore

@@ -14,6 +14,7 @@ tmp
 dist
 *.sublime-workspace
 OLD
+JUNK
 DB
 *.pyc
 *.jar
@@ -38,3 +39,4 @@ conf/external_pages.conf
 conf/dos.conf*
 conf/minio.conf*
 conf/api-keys.conf*
+solr*

conf/search.conf

@@ -4,6 +4,8 @@ search {
     # default to OR for q param
     andMode: false
 
+    defaultField: text
+
     fields = [
         itemId
         identifier
@@ -43,7 +45,12 @@ search {
 
     # Array of additional fields to include in the default search,
     # without boost.
-    extraFields = []
+    extraFields = [
+        txt_fr
+        txt_el
+        txt_de
+        txt_pl
+    ]
 
     # Spellcheck config
     spellcheck {

modules/solr/src/main/scala/eu/ehri/project/search/solr/SolrQueryBuilder.scala

@@ -179,9 +179,11 @@ private[solr] object SolrQueryBuilder {
     } else Seq.empty
   }
 
-  def basicParams(queryString: String, paging: PageParams, debug: Boolean): Seq[(String, String)] = Seq(
+  def basicParams(queryString: String, paging: PageParams, debug: Boolean, df: String): Seq[(String, String)] = Seq(
     "q" -> queryString,
+    "q.op" -> "or",
     "wt" -> "json",
+    "df" -> df,
     "start" -> paging.offset.toString,
     "rows" -> paging.limit.toString,
     "debugQuery" -> debug.toString,
@@ -258,7 +260,7 @@ case class SolrQueryBuilder @Inject()(config: Configuration) extends QueryBuilde
 
   private val jsonFacets = config.getOptional[Boolean]("search.jsonFacets").getOrElse(false)
   private val enableDebug = config.getOptional[Boolean]("search.debugTiming").getOrElse(false)
-
+  private val defaultField = config.get[String]("search.defaultField")
   private lazy val queryFields: Seq[String] = config.get[Seq[String]]("search.fields")
 
   /**
@@ -284,7 +286,7 @@ case class SolrQueryBuilder @Inject()(config: Configuration) extends QueryBuilde
     val queryString = localParam + query.params.query.getOrElse("*").trim
 
     Seq(
-      basicParams(queryString, query.paging, enableDebug),
+      basicParams(queryString, query.paging, enableDebug, defaultField),
       entityFilterParams(query.params.entities),
       bboxParams(query.params.bbox),
       latLngParams(query.params.latLng),
@@ -318,7 +320,7 @@ case class SolrQueryBuilder @Inject()(config: Configuration) extends QueryBuilde
     val queryString = localParam + query.params.query.getOrElse(defaultQuery).trim
 
     Seq(
-      basicParams(queryString, query.paging, enableDebug),
+      basicParams(queryString, query.paging, enableDebug, defaultField),
       groupParams(query.lang),
       fieldParams(query.params.fields, queryFieldsWithBoost, config),
       sortParams(query.params.sort),