From d221e08d67e3d852a30d689d6a65d2f6d029c29a Mon Sep 17 00:00:00 2001
From: Shy <me@shyy.io>
Date: Sat, 5 Jul 2025 09:56:50 -0400
Subject: [PATCH] Fix #534, version bump

---
 sist2-vue/src/Sist2ElasticsearchQuery.js | 2 +-
 sist2-vue/src/components/ContentDiv.vue  | 6 ++++--
 sist2-vue/src/i18n/messages.js           | 5 +++++
 sist2-vue/src/store/index.js             | 5 ++++-
 sist2-vue/src/views/Configuration.vue    | 6 ++++++
 src/sist.h                               | 4 ++--
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/sist2-vue/src/Sist2ElasticsearchQuery.js b/sist2-vue/src/Sist2ElasticsearchQuery.js
index 92db33f..98d3c81 100644
--- a/sist2-vue/src/Sist2ElasticsearchQuery.js
+++ b/sist2-vue/src/Sist2ElasticsearchQuery.js
@@ -238,7 +238,7 @@ class Sist2ElasticsearchQuery {
                 pre_tags: ["<mark>"],
                 post_tags: ["</mark>"],
                 fragment_size: getters.optFragmentSize,
-                number_of_fragments: 1,
+                number_of_fragments: getters.optFragmentCount,
                 order: "score",
                 fields: {
                     content: {},
diff --git a/sist2-vue/src/components/ContentDiv.vue b/sist2-vue/src/components/ContentDiv.vue
index 01effe4..ed6f59c 100644
--- a/sist2-vue/src/components/ContentDiv.vue
+++ b/sist2-vue/src/components/ContentDiv.vue
@@ -3,6 +3,8 @@
 </template>
 
 <script>
+const FRAGMENT_SEPARATOR = "<br /><i style='line-height: 2.4'>[…]</i><br/>";
+
 export default {
   name: "ContentDiv",
   props: ["doc"],
@@ -13,10 +15,10 @@ export default {
       }
 
       if (this.doc.highlight["content.nGram"]) {
-        return this.doc.highlight["content.nGram"][0];
+        return this.doc.highlight["content.nGram"].join(FRAGMENT_SEPARATOR);
       }
       if (this.doc.highlight.content) {
-        return this.doc.highlight.content[0];
+        return this.doc.highlight.content.join(FRAGMENT_SEPARATOR);
       }
     }
   }
diff --git a/sist2-vue/src/i18n/messages.js b/sist2-vue/src/i18n/messages.js
index b2ccebc..5e8a75f 100644
--- a/sist2-vue/src/i18n/messages.js
+++ b/sist2-vue/src/i18n/messages.js
@@ -59,6 +59,7 @@ export default {
             searchInPath: "Enable matching query against document path",
             suggestPath: "Enable auto-complete in path filter bar",
             fragmentSize: "Highlight context size",
+            fragmentCount: "Number of highlight snippets",
             queryMode: "Search mode",
             displayMode: "Display",
             columns: "Column count",
@@ -242,6 +243,7 @@ export default {
             searchInPath: "Abgleich der Abfrage mit dem Dokumentpfad aktivieren",
             suggestPath: "Aktiviere Auto-Vervollständigung in Pfadfilter-Leiste",
             fragmentSize: "Kontextgröße",
+            fragmentCount: "Anzahl der hervorgehobenen Snippets",
             queryMode: "Such-Modus",
             displayMode: "Ansicht",
             columns: "Anzahl Spalten",
@@ -417,6 +419,7 @@ export default {
             searchInPath: "Activer la recherche dans le chemin des documents",
             suggestPath: "Activer l'autocomplétion dans la barre de filtre de chemin",
             fragmentSize: "Longueur du contexte de surlignage",
+            fragmentCount: "Nombre d'extraits surlignés",
             queryMode: "Mode de recherche",
             displayMode: "Affichage",
             columns: "Nombre de colonnes",
@@ -592,6 +595,7 @@ export default {
             searchInPath: "匹配文档路径",
             suggestPath: "搜索框启用自动补全",
             fragmentSize: "高亮上下文大小",
+            fragmentCount: "突出显示的项目数",
             queryMode: "搜索模式",
             displayMode: "显示",
             columns: "列数",
@@ -767,6 +771,7 @@ export default {
             searchInPath: "Włącz szukanie również w ścieżce dokumentu",
             suggestPath: "Włącz auto-uzupełnianie w filtrze ścieżek",
             fragmentSize: "Podświetl wielkość kontekstu w znakach",
+            fragmentCount: "Liczba wyróżnionych fragmentów",
             queryMode: "Tryb szukania",
             displayMode: "Wyświetlanie",
             columns: "Liczba kolumn",
diff --git a/sist2-vue/src/store/index.js b/sist2-vue/src/store/index.js
index edc06ef..65b75de 100644
--- a/sist2-vue/src/store/index.js
+++ b/sist2-vue/src/store/index.js
@@ -3,7 +3,7 @@ import Vuex from "vuex"
 import {deserializeMimes, randomSeed, serializeMimes} from "@/util";
 import {getInstance} from "@/plugins/auth0.js";
 
-const CONF_VERSION = 3;
+const CONF_VERSION = 4;
 
 Vue.use(Vuex);
 
@@ -41,6 +41,7 @@ export default new Vuex.Store({
         optTagOrOperator: false,
         optFuzzy: true,
         optFragmentSize: 200,
+        optFragmentCount: 1,
         optQueryMode: "simple",
         optSearchInPath: false,
         optColumns: "auto",
@@ -170,6 +171,7 @@ export default new Vuex.Store({
         setOptSearchInPath: (state, val) => state.optSearchInPath = val,
         setOptSuggestPath: (state, val) => state.optSuggestPath = val,
         setOptFragmentSize: (state, val) => state.optFragmentSize = val,
+        setOptFragmentCount: (state, val) => state.optFragmentCount = val,
         setOptQueryMode: (state, val) => state.optQueryMode = val,
         setOptResultSize: (state, val) => state.optSize = val,
         setOptTagOrOperator: (state, val) => state.optTagOrOperator = val,
@@ -430,6 +432,7 @@ export default new Vuex.Store({
         optSearchInPath: state => state.optSearchInPath,
         optSuggestPath: state => state.optSuggestPath,
         optFragmentSize: state => state.optFragmentSize,
+        optFragmentCount: state => state.optFragmentCount,
         optQueryMode: state => state.optQueryMode,
         optTreemapType: state => state.optTreemapType,
         optTreemapTiling: state => state.optTreemapTiling,
diff --git a/sist2-vue/src/views/Configuration.vue b/sist2-vue/src/views/Configuration.vue
index 49af018..3440309 100644
--- a/sist2-vue/src/views/Configuration.vue
+++ b/sist2-vue/src/views/Configuration.vue
@@ -151,6 +151,10 @@
                     <b-form-input :value="optFragmentSize" step="10" type="number" min="0"
                                   @input="setOptFragmentSize"></b-form-input>
 
+                  <label :class="{'text-muted': uiSqliteMode}">{{ $t("opt.fragmentCount") }}</label>
+                  <b-form-input :value="optFragmentCount" :disabled="uiSqliteMode" step="1" type="number" min="1"
+                                @input="setOptFragmentCount"></b-form-input>
+
                     <label>{{ $t("opt.resultSize") }}</label>
                     <b-form-input :value="optResultSize" type="number" min="10"
                                   @input="setOptResultSize"></b-form-input>
@@ -314,6 +318,7 @@ export default {
             "optSearchInPath",
             "optSuggestPath",
             "optFragmentSize",
+            "optFragmentCount",
             "optQueryMode",
             "optTreemapType",
             "optTreemapTiling",
@@ -360,6 +365,7 @@ export default {
             "setOptSearchInPath",
             "setOptSuggestPath",
             "setOptFragmentSize",
+            "setOptFragmentCount",
             "setOptQueryMode",
             "setOptTreemapType",
             "setOptTreemapTiling",
diff --git a/src/sist.h b/src/sist.h
index 43fb319..c5b0630 100644
--- a/src/sist.h
+++ b/src/sist.h
@@ -51,11 +51,11 @@
 #include <ctype.h>
 #include "git_hash.h"
 
-#define VERSION "3.4.6"
+#define VERSION "3.4.7"
 static const char *const Version = VERSION;
 static const int VersionMajor = 3;
 static const int VersionMinor = 4;
-static const int VersionPatch = 6;
+static const int VersionPatch = 7;
 
 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown