Highlight index fields of type text (#50)

* Highlight index fields of type text

.gitignore

@@ -16,6 +16,7 @@ target/
 /.make
 *.json
 *.lst
+*.log
 globalise.http
 /globalise.http
 /mondriaan.http

src/main/kotlin/nl/knaw/huc/broccoli/api/ElasticQuery.kt

@@ -68,16 +68,21 @@ data class Sort(
 
 data class HighlightTerm(
     @JsonIgnore val text: String,
-    @JsonIgnore val fragmentSize: Int
+    @JsonIgnore val fragmentSize: Int,
+    @JsonIgnore val extraFields: List<String>? = null
 ) {
     @JsonAnyGetter
     fun toJson() = mapOf(
-        "fields" to mapOf(
+        "fields" to mutableMapOf(
             "text" to mapOf(
                 "type" to "unified",
                 "fragment_size" to fragmentSize,
             )
-        ),
+        ).apply {
+            extraFields?.forEach {
+                put(it, mapOf("type" to "unified"))
+            }
+        },
         "highlight_query" to FullTextQuery(QueryString(text))
     )
 }

src/main/kotlin/nl/knaw/huc/broccoli/core/ElasticQueryBuilder.kt

@@ -48,8 +48,13 @@ class ElasticQueryBuilder(private val index: IndexConfiguration) {
             )
         ),
 
-        highlight = query.text
-            ?.let { HighlightTerm(it, fragmentSize) },
+        highlight = query.text?.let { queryText ->
+            HighlightTerm(
+                text = queryText,
+                fragmentSize = fragmentSize,
+                extraFields = index.fields.filter { it.type == "text" }.map { it.name }
+            )
+        },
 
         aggregations = (query.aggregations ?: index.fields.map { it.name })
             .mapNotNull { fieldName ->