update to 3.6.2

lucee · Jan 17, 2025 · c21f131 · c21f131
1 parent 854a2ec
commit c21f131
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/source/java/src/org/lucee/extension/search/lucene/LuceneSearchCollection.java b/source/java/src/org/lucee/extension/search/lucene/LuceneSearchCollection.java
@@ -78,6 +78,8 @@ public boolean accept(Resource pathname) {
 	private Log log;
 
 	private final CFMLEngine engine;
+
+	private IndexWriterConfig config;
 	private static final SerializableObject token = new SerializableObject();
 
 	/**
@@ -213,7 +215,7 @@ private void indexSpellCheck(String id) throws SearchException {
 			Dictionary dictionary = new LuceneDictionary(reader, "contents");
 
 			SpellChecker spellChecker = new SpellChecker(spellDir);
-			spellChecker.indexDictionary(dictionary);
+			spellChecker.indexDictionary(dictionary, _getConfig(), true);
 
 		} catch (Exception e) {
 			throw new SearchException(e);
@@ -793,6 +795,14 @@ private Resource _getIndexDirectory(String id, boolean createIfNotExists) {
 		return indexDir;
 	}
 
+	private IndexWriterConfig _getConfig() throws SearchException {
+		if (config == null) {
+			config = new IndexWriterConfig(CommonUtil.VERSION, SearchUtil.getAnalyzer(getLanguage()));
+
+		}
+		return config;
+	}
+
 	/**
 	 * get writer to id
 	 * 
@@ -805,7 +815,6 @@ private Resource _getIndexDirectory(String id, boolean createIfNotExists) {
 	 */
 	private IndexWriter _getWriter(String id, boolean create) throws SearchException, IOException, PageException {
 		Resource dir = _getIndexDirectory(id, true);
-		IndexWriterConfig config = new IndexWriterConfig(CommonUtil.VERSION, SearchUtil.getAnalyzer(getLanguage()));
 
 		// Set create/append mode
 		if (create) {
@@ -814,7 +823,7 @@ private IndexWriter _getWriter(String id, boolean create) throws SearchException
 			config.setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND);
 		}
 
-		return new IndexWriter(FSDirectory.open(engine.getCastUtil().toFile(dir)), config);
+		return new IndexWriter(FSDirectory.open(engine.getCastUtil().toFile(dir)), _getConfig());
 	}
 
 	private IndexReader _getReader(String id, boolean absolute) throws IOException, PageException {

diff --git a/source/java/src/org/lucee/extension/search/lucene/highlight/_Highlight.java b/source/java/src/org/lucee/extension/search/lucene/highlight/_Highlight.java
@@ -7,6 +7,7 @@
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.highlight.Highlighter;
+import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
 import org.apache.lucene.search.highlight.QueryScorer;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 
@@ -15,7 +16,7 @@
 public class _Highlight {
 
 	public static String createContextSummary(Object highlighter, Analyzer analyzer, String text, int maxNumFragments,
-			String defaultValue) throws IOException {
+			String defaultValue) throws IOException, InvalidTokenOffsetsException {
 		// try {
 		if (!(highlighter instanceof Highlighter) || analyzer == null || Util.isEmpty(text))
 			return defaultValue;