Full-text search: Use Lucene 5.x instead of 6.x to stay on Java 1.7

gnosygnu · Mar 13, 2017 · c08ea3b · c08ea3b
1 parent af6f7cf
commit c08ea3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java
@@ -30,8 +30,8 @@ public static void Run(String... args) {
 		}
 	}
 	public static final String		Name			= "xowa";
-	public static final int		Version_id		= 519;
-	public static final String		Version			= "4.4.1.1703";
+	public static final int		Version_id		= 520;
+	public static final String		Version			= "4.4.2.1703";
 	public static String	Build_date		= "2012-12-30 00:00:00";
 	public static String	Build_date_fmt	= "yyyy-MM-dd HH:mm:ss";
 	public static String	Op_sys_str;

diff --git a/400_xowa/src/gplx/xowa/wikis/pages/Xowe_page_mgr.java b/400_xowa/src/gplx/xowa/wikis/pages/Xowe_page_mgr.java
@@ -69,7 +69,6 @@ public void Init_by_wiki(Xowe_wiki wiki) {
 			page = wiki.Data_mgr().Load_page_and_parse(url, ttl, wiki.Lang(), tab, false);
 			ttl = page.Ttl();	// note that Load_page_and_parse can redirect ttl; EX: Special:Random -> A; DATE:2017-01-05
 		}
-
 
 		// load from html_db
 		boolean from_html_db = page.Db().Page().Html_db_id() != -1;

diff --git a/gplx.gflucene/.classpath b/gplx.gflucene/.classpath
@@ -2,11 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/100_core"/>
-	<classpathentry kind="lib" path="lib/lucene-core-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-memory-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queryparser-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-common-6.4.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-5.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-5.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-5.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-5.5.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/gplx.gflucene/src/gplx/gflucene/analyzers/Gflucene_analyzer_mgr_.java b/gplx.gflucene/src/gplx/gflucene/analyzers/Gflucene_analyzer_mgr_.java
@@ -16,7 +16,6 @@ XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 package gplx.gflucene.analyzers; import gplx.*; import gplx.gflucene.*;
 import gplx.gflucene.core.*;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.CharArraySet;
 public class Gflucene_analyzer_mgr_ {
 		public static Analyzer New_analyzer(String key) {
 		if 		(String_.Eq(key, "standard"))        return new org.apache.lucene.analysis.standard.StandardAnalyzer();