diff src/luan/modules/lucene/Lucene.luan @ 1395:9dfff82dfc59

finish postgres work
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 09 Sep 2019 01:22:23 -0600
parents 002152af497a
children 0dc9837c16be
line wrap: on
line diff
--- a/src/luan/modules/lucene/Lucene.luan	Sun Sep 08 22:13:08 2019 -0600
+++ b/src/luan/modules/lucene/Lucene.luan	Mon Sep 09 01:22:23 2019 -0600
@@ -35,16 +35,20 @@
 
 Lucene.literal = SaneQueryParser.literal
 
-function Lucene.index(index_dir,default_type,default_fields,postgres_spec)
+-- function Lucene.index(index_dir,default_type,default_fields)
+
+function Lucene.index(index_dir,options)
 	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"
-	postgres_spec==nil or type(postgres_spec)=="table" or error "postgres_spec must be table"
+	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,default_type,default_fields,postgres_spec)
+	local java_index, closer = LuceneIndex.getLuceneIndex(index_dir.java.file,options.default_type,options.default_fields,options.completer,options.postgres_spec)
 	index.java = java_index
 	index.closer = closer or error()
-	index.completer = postgres_spec and postgres_spec.completer
+	index.completer = options.completer
 
 	index.indexed_fields = {}
 	local mt = {}