diff src/luan/modules/lucene/Lucene.luan @ 1397:0dc9837c16be

fix lucene issues
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 11 Sep 2019 01:31:21 -0600
parents 9dfff82dfc59
children 67c0e47b5be3
line wrap: on
line diff
--- a/src/luan/modules/lucene/Lucene.luan	Tue Sep 10 13:41:22 2019 -0600
+++ b/src/luan/modules/lucene/Lucene.luan	Wed Sep 11 01:31:21 2019 -0600
@@ -41,13 +41,10 @@
 	type(index_dir)=="table" or error "index_dir must be table"
 	index_dir.to_uri_string and matches(index_dir.to_uri_string(),"^file:") or error "must be file"
 	options = options or {}
-	options.postgres_spec==nil or type(options.postgres_spec)=="table" or error "postgres_spec must be table"
-	options.completer==nil or type(options.completer)=="function" or error "completer must be table"
 	local index = {}
 	index.dir = index_dir
-	local java_index, closer = LuceneIndex.getLuceneIndex(index_dir.java.file,options.default_type,options.default_fields,options.completer,options.postgres_spec)
+	local java_index = LuceneIndex.getLuceneIndex(index_dir.java.file,options)
 	index.java = java_index
-	index.closer = closer or error()
 	index.completer = options.completer
 
 	index.indexed_fields = {}
@@ -73,13 +70,14 @@
 	index.highlighter = java_index.highlighter
 	index.indexed_only_fields = java_index.indexed_only_fields
 	index.count_tokens = java_index.count_tokens
-	index.close = closer.close
+	index.close = java_index.close
 
 	index.has_postgres_backup = java_index.hasPostgresBackup()
 	function index.rebuild_postgres_backup()
 		java_index.rebuild_postgres_backup(index.completer)
 	end
 	index.restore_from_postgres = java_index.restore_from_postgres
+	index.force_restore_from_postgres = java_index.force_restore_from_postgres
 	function index.check()
 		java_index.check(index.completer)
 	end