diff src/luan/modules/lucene/LuceneIndex.java @ 1369:709f7498a363

change Lucene.index() and add Lucene.recover()
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 19 Jun 2019 00:26:10 -0600
parents 643cf1c37723
children 87a3738d7cc5
line wrap: on
line diff
--- a/src/luan/modules/lucene/LuceneIndex.java	Tue Jun 18 21:56:53 2019 -0600
+++ b/src/luan/modules/lucene/LuceneIndex.java	Wed Jun 19 00:26:10 2019 -0600
@@ -110,14 +110,14 @@
 
 	private static Map<String,LuceneIndex> indexes = new HashMap<String,LuceneIndex>();
 
-	public static Object[] getLuceneIndex(Luan luan,String indexDirStr,FieldParser defaultFieldParser,String[] defaultFields)
+	public static Object[] getLuceneIndex(Luan luan,File indexDir,FieldParser defaultFieldParser,String[] defaultFields)
 		throws LuanException, IOException
 	{
-		String key = new File(indexDirStr).getCanonicalPath();
+		String key = indexDir.getCanonicalPath();
 		synchronized(indexes) {
 			LuceneIndex li = indexes.get(key);
 			if( li == null ) {
-				li = new LuceneIndex(indexDirStr,defaultFieldParser,defaultFields,key);
+				li = new LuceneIndex(indexDir,defaultFieldParser,defaultFields,key);
 				li.openCount = 1;
 				indexes.put(key,li);
 			} else {
@@ -157,7 +157,7 @@
 	private final FieldParser defaultFieldParser;
 	private final String[] defaultFields;
 
-	private LuceneIndex(String indexDirStr,FieldParser defaultFieldParser,String[] defaultFields,String key)
+	private LuceneIndex(File indexDir,FieldParser defaultFieldParser,String[] defaultFields,String key)
 		throws LuanException, IOException
 	{
 		this.key = key;
@@ -166,7 +166,6 @@
 		mfp = defaultFieldParser==null ? new MultiFieldParser() : new MultiFieldParser(defaultFieldParser,defaultFields);
 		mfp.fields.put( "type", STRING_FIELD_PARSER );
 		mfp.fields.put( "id", NumberFieldParser.LONG );
-		File indexDir = new File(indexDirStr);
 		this.indexDir = indexDir;
 		Analyzer analyzer = STRING_FIELD_PARSER.analyzer;
 		if( defaultFieldParser instanceof StringFieldParser ) {