From 5967c75433ed2fb77a289d65ad3b4bed8295e9c0 Mon Sep 17 00:00:00 2001
From: gnosygnu <gnosygnu@gmail.com>
Date: Sat, 18 Mar 2017 08:06:13 -0400
Subject: [PATCH] Js: Update references to mobile lib; change Add_core to
 Add_baselib

---
 .../apps/updates/specials/Xoa_update_html.java       |  2 +-
 .../gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java    |  2 +-
 gplx.gflucene/.classpath                             | 12 ++++++------
 .../highlighters/Gflucene_highlighter_mgr.java       |  7 ++++++-
 .../gplx/gflucene/indexers/Gflucene_indexer_mgr.java |  4 ++--
 .../gflucene/searchers/Gflucene_searcher_mgr.java    |  4 ++--
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_html.java b/400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_html.java
index a4d237238..1f89d4db1 100644
--- a/400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_html.java
+++ b/400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_html.java
@@ -57,7 +57,7 @@ public class Xoa_update_html extends Xow_special_wtr__base {
 	}
 	@Override protected void Bld_tags(Xoa_app app, Io_url addon_dir, Xopage_html_data page_data) {
 		Xopg_tag_mgr head_tags = page_data.Head_tags();
-		Xopg_tag_wtr_.Add__core				(head_tags, app.Fsys_mgr().Http_root());
+		Xopg_tag_wtr_.Add__baselib			(head_tags, app.Fsys_mgr().Http_root());
 		Xopg_tag_wtr_.Add__xocss			(head_tags, app.Fsys_mgr().Http_root());
 		Xopg_tag_wtr_.Add__xohelp			(head_tags, app.Fsys_mgr().Http_root());
 		Xopg_tag_wtr_.Add__xolog			(head_tags, app.Fsys_mgr().Http_root());
diff --git a/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java b/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java
index 0a1e53a52..44b0425d5 100644
--- a/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java
+++ b/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.xowa.wikis.pages.tags; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.pages.*;
 public class Xopg_tag_wtr_ {
-	public static void Add__core(Xopg_tag_mgr head_tags, Io_url http_root) {
+	public static void Add__baselib(Xopg_tag_mgr head_tags, Io_url http_root) {
 		Io_url css_dir = http_root.GenSubDir_nest("bin", "any", "xowa", "html", "res", "src", "xowa", "core");
 		head_tags.Add(Xopg_tag_itm.New_js_file(css_dir.GenSubFil_nest("Namespace_.js")));
 		head_tags.Add(Xopg_tag_itm.New_js_file(css_dir.GenSubFil_nest("String_.js")));
diff --git a/gplx.gflucene/.classpath b/gplx.gflucene/.classpath
index ca4582672..ed44ea847 100644
--- a/gplx.gflucene/.classpath
+++ b/gplx.gflucene/.classpath
@@ -3,11 +3,11 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/100_core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/6.4.2/lucene-analyzers-common-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/6.4.2/lucene-core-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/6.4.2/lucene-highlighter-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/6.4.2/lucene-memory-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/6.4.2/lucene-queryparser-6.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/6.4.2/lucene-queries-6.4.2.jar"/>
+	<classpathentry kind="lib" path="lib/5.3.0.drd/lucene-analyzers-common-5.3.0-mobile-2.jar"/>
+	<classpathentry kind="lib" path="lib/5.3.0.drd/lucene-core-5.3.0-mobile-2.jar"/>
+	<classpathentry kind="lib" path="lib/5.3.0.drd/lucene-highlighter-5.3.0-mobile-2.jar"/>
+	<classpathentry kind="lib" path="lib/5.3.0.drd/lucene-memory-5.3.0-mobile-2.jar"/>
+	<classpathentry kind="lib" path="lib/5.3.0.drd/lucene-queries-5.3.0-mobile-2.jar"/>
+	<classpathentry kind="lib" path="lib/5.3.0.drd/lucene-queryparser-5.3.0-mobile-2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/gplx.gflucene/src/gplx/gflucene/highlighters/Gflucene_highlighter_mgr.java b/gplx.gflucene/src/gplx/gflucene/highlighters/Gflucene_highlighter_mgr.java
index abd52d293..62989439d 100644
--- a/gplx.gflucene/src/gplx/gflucene/highlighters/Gflucene_highlighter_mgr.java
+++ b/gplx.gflucene/src/gplx/gflucene/highlighters/Gflucene_highlighter_mgr.java
@@ -71,7 +71,12 @@ public class Gflucene_highlighter_mgr {
 
 		// get token stream
 		String text = doc_data.body;
-		TokenStream tokenStream = analyzer.tokenStream("body", text);
+		TokenStream tokenStream = null;
+		try {
+			tokenStream = analyzer.tokenStream("body", text);
+		} catch (IOException e) {
+			throw Err_.new_exc(e, "lucene_index", "failed to get stream", "query", qry_data.query);
+		}
 		
 		// get fragments from stream
 		TextFragment[] frags;
diff --git a/gplx.gflucene/src/gplx/gflucene/indexers/Gflucene_indexer_mgr.java b/gplx.gflucene/src/gplx/gflucene/indexers/Gflucene_indexer_mgr.java
index 8a2ef9ffb..2990d371d 100644
--- a/gplx.gflucene/src/gplx/gflucene/indexers/Gflucene_indexer_mgr.java
+++ b/gplx.gflucene/src/gplx/gflucene/indexers/Gflucene_indexer_mgr.java
@@ -16,8 +16,8 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 package gplx.gflucene.indexers; import gplx.*; import gplx.gflucene.*;
 import gplx.gflucene.core.*;
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import org.lukhnos.portmobile.file.Path;
+import org.lukhnos.portmobile.file.Paths;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
diff --git a/gplx.gflucene/src/gplx/gflucene/searchers/Gflucene_searcher_mgr.java b/gplx.gflucene/src/gplx/gflucene/searchers/Gflucene_searcher_mgr.java
index 7943c1617..d9506e4d3 100644
--- a/gplx.gflucene/src/gplx/gflucene/searchers/Gflucene_searcher_mgr.java
+++ b/gplx.gflucene/src/gplx/gflucene/searchers/Gflucene_searcher_mgr.java
@@ -17,8 +17,8 @@ package gplx.gflucene.searchers; import gplx.*; import gplx.gflucene.*;
 import gplx.gflucene.core.*;
 import gplx.gflucene.analyzers.*;
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import org.lukhnos.portmobile.file.Path;
+import org.lukhnos.portmobile.file.Paths;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;