Mercurial Hosting > luan

annotate src/luan/modules/lucene/Lucene.luan @ 1459:b04b8fc5f4f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GoodQueryParser
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 20 Mar 2020 11:06:53 -0600
parents 6b6c11c9164e
children 13cbce740e1e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1353
8d95711f6615 replace java() with require "java"
Franklin Schmidt <fschmidt@gmail.com>
parents: 1348
diff changeset
1 require "java"
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 625
diff changeset
2 local Luan = require "luan:Luan.luan"
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
3 local error = Luan.error
625
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
4 local ipairs = Luan.ipairs or error()
1429
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
5 local pairs = Luan.pairs or error()
625
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
6 local type = Luan.type or error()
796
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
7 local set_metatable = Luan.set_metatable or error()
1365
6617763dfd76 fix logging and lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1353
diff changeset
8 local Boot = require "luan:Boot.luan"
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 625
diff changeset
9 local Html = require "luan:Html.luan"
1429
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
10 local Number = require "luan:Number.luan"
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
11 local integer = Number.integer or error()
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
12 local Io = require "luan:Io.luan"
746
293c397e8dee improve zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 730
diff changeset
13 local uri = Io.uri or error()
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
14 local String = require "luan:String.luan"
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
15 local matches = String.matches or error()
749
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
16 local Rpc = require "luan:Rpc.luan"
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
17 local LuceneIndex = require "java:luan.modules.lucene.LuceneIndex"
1458
6b6c11c9164e goodjava.lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1457
diff changeset
18 local NumberFieldParser = require "java:goodjava.lucene.queryparser.NumberFieldParser"
1459
b04b8fc5f4f4 GoodQueryParser
Franklin Schmidt <fschmidt@gmail.com>
parents: 1458
diff changeset
19 local GoodQueryParser = require "java:goodjava.lucene.queryparser.GoodQueryParser"
1368
5225cd6ed478 add Lucene schedule_backups_to
Franklin Schmidt <fschmidt@gmail.com>
parents: 1367
diff changeset
20 local Logging = require "luan:logging/Logging.luan"
5225cd6ed478 add Lucene schedule_backups_to
Franklin Schmidt <fschmidt@gmail.com>
parents: 1367
diff changeset
21 local logger = Logging.logger "Lucene"
544
c5a93767cc5c lucene overhaul, untested
Franklin Schmidt <fschmidt@gmail.com>
parents: 542
diff changeset
22
320
fed1893821bf remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 312
diff changeset
23
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
24 local Lucene = {}
230
4438cb2e04d0 start lucene
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
25
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
26 Lucene.type = {
1345
6f8988830098 unique LuceneIndex per dir
Franklin Schmidt <fschmidt@gmail.com>
parents: 1344
diff changeset
27 english = LuceneIndex.ENGLISH_FIELD_PARSER
6f8988830098 unique LuceneIndex per dir
Franklin Schmidt <fschmidt@gmail.com>
parents: 1344
diff changeset
28 string = LuceneIndex.STRING_FIELD_PARSER
6f8988830098 unique LuceneIndex per dir
Franklin Schmidt <fschmidt@gmail.com>
parents: 1344
diff changeset
29 integer = NumberFieldParser.INT
6f8988830098 unique LuceneIndex per dir
Franklin Schmidt <fschmidt@gmail.com>
parents: 1344
diff changeset
30 long = NumberFieldParser.LONG
6f8988830098 unique LuceneIndex per dir
Franklin Schmidt <fschmidt@gmail.com>
parents: 1344
diff changeset
31 double = NumberFieldParser.DOUBLE
544
c5a93767cc5c lucene overhaul, untested
Franklin Schmidt <fschmidt@gmail.com>
parents: 542
diff changeset
32 }
c5a93767cc5c lucene overhaul, untested
Franklin Schmidt <fschmidt@gmail.com>
parents: 542
diff changeset
33
1459
b04b8fc5f4f4 GoodQueryParser
Franklin Schmidt <fschmidt@gmail.com>
parents: 1458
diff changeset
34 Lucene.quote = GoodQueryParser.quote
547
0be287ab0309 add lucene/Versioning and simplify Lucene fn names
Franklin Schmidt <fschmidt@gmail.com>
parents: 546
diff changeset
35
1395
9dfff82dfc59 finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents: 1392
diff changeset
36 function Lucene.index(index_dir,options)
1369
709f7498a363 change Lucene.index() and add Lucene.recover()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1368
diff changeset
37 type(index_dir)=="table" or error "index_dir must be table"
709f7498a363 change Lucene.index() and add Lucene.recover()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1368
diff changeset
38 index_dir.to_uri_string and matches(index_dir.to_uri_string(),"^file:") or error "must be file"
1395
9dfff82dfc59 finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents: 1392
diff changeset
39 options = options or {}
303
fdb4bd391c28 add lucene close();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 300
diff changeset
40 local index = {}
591
790d5de23042 add "strict" param to Io.repr();
Franklin Schmidt <fschmidt@gmail.com>
parents: 547
diff changeset
41 index.dir = index_dir
1453
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
42 index.completer = options.completer
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
43 options.completer = nil
1397
0dc9837c16be fix lucene issues
Franklin Schmidt <fschmidt@gmail.com>
parents: 1395
diff changeset
44 local java_index = LuceneIndex.getLuceneIndex(index_dir.java.file,options)
1129
3234a14bb1f8 minor lucene changes
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
45 index.java = java_index
796
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
46
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
47 index.indexed_fields = {}
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
48 local mt = {}
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
49 set_metatable(index.indexed_fields,mt)
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
50 function mt.__index(_,key)
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
51 return java_index.getIndexedFieldParser(key)
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
52 end
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
53 function mt.__new_index(_,key,value)
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
54 return java_index.setIndexedFieldParser(key,value)
6b8ea0a9b7c9 remove LuanMeta
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
55 end
618
5e495e4e560b add lucene indexed_only_fields
Franklin Schmidt <fschmidt@gmail.com>
parents: 617
diff changeset
56
303
fdb4bd391c28 add lucene close();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 300
diff changeset
57 index.to_string = java_index.to_string
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
58 index.snapshot = java_index.snapshot
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
59 index.advanced_search = java_index.advanced_search
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
60 index.search_in_transaction = java_index.search_in_transaction
303
fdb4bd391c28 add lucene close();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 300
diff changeset
61 index.delete_all = java_index.delete_all
547
0be287ab0309 add lucene/Versioning and simplify Lucene fn names
Franklin Schmidt <fschmidt@gmail.com>
parents: 546
diff changeset
62 index.delete = java_index.delete
1453
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
63 --index.save = java_index.save
1379
87a3738d7cc5 run_in_transaction
Franklin Schmidt <fschmidt@gmail.com>
parents: 1377
diff changeset
64 index.run_in_transaction = java_index.run_in_transaction
591
790d5de23042 add "strict" param to Io.repr();
Franklin Schmidt <fschmidt@gmail.com>
parents: 547
diff changeset
65 index.ensure_open = java_index.ensure_open
617
e54c1646eed0 add Lucene.next_id()
Franklin Schmidt <fschmidt@gmail.com>
parents: 599
diff changeset
66 index.next_id = java_index.nextId
624
8281a248c47e add lucene highlighter
Franklin Schmidt <fschmidt@gmail.com>
parents: 622
diff changeset
67 index.highlighter = java_index.highlighter
1343
7d9a1f8894b0 lucene change indexed_only_field() to indexed_only_fields()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1342
diff changeset
68 index.indexed_only_fields = java_index.indexed_only_fields
1341
a015a0b5c388 add Html.decode(), Lucene.count_tokens(), lucene boosts, Sql.database.set()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1330
diff changeset
69 index.count_tokens = java_index.count_tokens
1398
67c0e47b5be3 more lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1397
diff changeset
70 --index.close = java_index.close
709
96a280ca32a2 add Lucene.instances
Franklin Schmidt <fschmidt@gmail.com>
parents: 707
diff changeset
71
1453
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
72 local java_save = java_index.save
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
73 function index.save(doc,boosts)
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
74 java_save(index.completer,doc,boosts)
1391
94f48cc76de8 add lucene check
Franklin Schmidt <fschmidt@gmail.com>
parents: 1388
diff changeset
75 end
1453
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
76
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
77 index.has_postgres_backup = java_index.hasPostgresBackup()
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
78 index.rebuild_postgres_backup = java_index.rebuild_postgres_backup
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
79 function index.restore_from_postgres()
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
80 java_index.restore_from_postgres(index.completer)
1391
94f48cc76de8 add lucene check
Franklin Schmidt <fschmidt@gmail.com>
parents: 1388
diff changeset
81 end
1453
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
82 function index.force_restore_from_postgres()
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
83 java_index.force_restore_from_postgres(index.completer)
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
84 end
928be2a4d565 fix postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1431
diff changeset
85 index.check = java_index.check
1387
bc40bc9aab3a start postgres backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1379
diff changeset
86
1342
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
87 function index.search( query, from, to, options )
770
Franklin Schmidt <fschmidt@gmail.com>
parents: 761
diff changeset
88 from or error "missing 'from' parameter"
Franklin Schmidt <fschmidt@gmail.com>
parents: 761
diff changeset
89 to or error "missing 'to' parameter"
1342
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
90 options = options or {}
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
91 local explain_fld = options.explain
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
92 local score_fld = options.score
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
93 local results = {}
1342
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
94 local function fn(i,doc_fn,score)
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
95 if i >= from then
1342
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
96 local doc
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
97 if explain_fld == nil then
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
98 doc = doc_fn()
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
99 else
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
100 local explanation
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
101 doc, explanation = doc_fn("explain")
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
102 doc[explain_fld] = explanation.toString()
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
103 end
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
104 if score_fld ~= nil then
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
105 doc[score_fld] = score
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
106 end
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
107 results[#results+1] = doc
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
108 end
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
109 end
1342
60599adc27b8 add lucene search options
Franklin Schmidt <fschmidt@gmail.com>
parents: 1341
diff changeset
110 local total_hits = index.advanced_search(query,fn,to,options.sort)
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
111 return results, total_hits
257
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
112 end
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
113
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
114 function index.get_document(query)
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
115 local doc
1348
af478a1bd23d bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1345
diff changeset
116 local function fn(_,doc_fn,_)
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
117 doc = doc_fn()
257
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
118 end
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
119 local total_hits = index.advanced_search(query,fn,1)
1457
Franklin Schmidt <fschmidt@gmail.com>
parents: 1453
diff changeset
120 total_hits <= 1 or error("found "..total_hits.." documents for query: "..query)
257
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
121 return doc
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
122 end
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
123
c5c60eca33dd allow Lucene search for 0 rows
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
124 function index.count(query)
545
ddcd4296107a clean up lucene search
Franklin Schmidt <fschmidt@gmail.com>
parents: 544
diff changeset
125 return index.advanced_search(query)
232
9ce18106f95a more lucene work
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 230
diff changeset
126 end
9ce18106f95a more lucene work
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 230
diff changeset
127
625
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
128 function index.html_highlighter(query,formatter,container_tags)
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
129 local highlighter = index.highlighter(query,formatter)
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
130 return function(html)
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
131 local list = Html.parse(html,container_tags)
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
132 local result = {}
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
133 for _, obj in ipairs(list) do
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
134 if type(obj) == "string" then
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
135 obj = highlighter(obj)
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
136 end
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
137 result[#result+1] = obj
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
138 end
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
139 return Html.to_string(result)
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
140 end
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
141 end
a3c1e11fb6aa rewrite much of Html to be more understandable;
Franklin Schmidt <fschmidt@gmail.com>
parents: 624
diff changeset
142
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
143 function index.zip(zip_file)
761
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
144 index.snapshot( function(dir_path,file_names)
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
145 zip_file.delete()
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
146 local zip_path = zip_file.canonical().to_string()
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
147 local dir = uri("file:"..dir_path)
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
148 local dir_name = dir.name()
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
149 local options = {dir=dir.parent()}
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
150 for _, file_name in ipairs(file_names) do
761
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
151 local cmd = "zip "..zip_path.." "..dir_name.."/"..file_name
1431
Franklin Schmidt <fschmidt@gmail.com>
parents: 1429
diff changeset
152 uri("os:"..cmd,options).read_text()
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
153 end
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
154 end )
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
155 end
1365
6617763dfd76 fix logging and lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1353
diff changeset
156 index.zip = Boot.no_security(index.zip)
707
1ed9e55f0be8 replace lucene.backup with lucene.zip implemented in luan, and add lucene.snapshot
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
157
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
158 function index.restore(zip_file)
756
9092e52f94eb better synchronization for lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 754
diff changeset
159 java_index.run_in_lock( function()
1369
709f7498a363 change Lucene.index() and add Lucene.recover()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1368
diff changeset
160 local lucene_dir = index.dir
756
9092e52f94eb better synchronization for lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 754
diff changeset
161 local before_restore = lucene_dir.parent().child("before_restore.zip")
9092e52f94eb better synchronization for lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 754
diff changeset
162 index.zip(before_restore)
1398
67c0e47b5be3 more lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1397
diff changeset
163 java_index.close()
756
9092e52f94eb better synchronization for lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 754
diff changeset
164 lucene_dir.delete()
1431
Franklin Schmidt <fschmidt@gmail.com>
parents: 1429
diff changeset
165 uri("os:unzip "..zip_file.canonical().to_string(),{dir=lucene_dir.parent()}).read_text()
756
9092e52f94eb better synchronization for lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 754
diff changeset
166 java_index.reopen()
9092e52f94eb better synchronization for lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 754
diff changeset
167 end )
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
168 end
1365
6617763dfd76 fix logging and lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1353
diff changeset
169 index.restore = Boot.no_security(index.restore)
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
170
1429
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
171 function index.update(steps)
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
172 local version = 0
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
173 for i in pairs(steps) do
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
174 if version < i then
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
175 version = i
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
176 end
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
177 end
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
178 local doc = index.get_document"type:version" or { type="version", version=integer(0) }
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
179 while doc.version < version do
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
180 doc.version = integer(doc.version + 1)
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
181 logger.error("step "..doc.version)
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
182 index.run_in_transaction( function()
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
183 local step = steps[doc.version] or error("missing step "..doc.version)
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
184 step()
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
185 index.save(doc)
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
186 end )
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
187 end
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
188 end
82415c9c0015 move versioning into Lucene
Franklin Schmidt <fschmidt@gmail.com>
parents: 1427
diff changeset
189
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
190 local function multi_error()
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
191 error "multiple lucene instances"
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
192 end
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
193
1133
ba4daf107e07 fix security bug
Franklin Schmidt <fschmidt@gmail.com>
parents: 1129
diff changeset
194 if Rpc.functions.lucene_backup == nil then
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
195
749
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
196 function Rpc.functions.lucene_backup(password)
757
Franklin Schmidt <fschmidt@gmail.com>
parents: 756
diff changeset
197 Io.password == password or error "wrong password"
1369
709f7498a363 change Lucene.index() and add Lucene.recover()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1368
diff changeset
198 local zip_file = index.dir.parent().child("backup.zip")
749
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
199 index.zip(zip_file)
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
200 return zip_file
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
201 end
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
202
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
203 function Rpc.functions.lucene_restore(password,zip_file)
757
Franklin Schmidt <fschmidt@gmail.com>
parents: 756
diff changeset
204 Io.password == password or error "wrong password"
1369
709f7498a363 change Lucene.index() and add Lucene.recover()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1368
diff changeset
205 local backup_zip = index.dir.parent().child("backup.zip")
761
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
206 backup_zip.write(zip_file)
99356cfde2f0 remove horrible java zip
Franklin Schmidt <fschmidt@gmail.com>
parents: 757
diff changeset
207 index.restore(backup_zip)
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
208 end
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
209
749
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
210 else
754
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
211 Rpc.functions.lucene_backup = multi_error
1a101ac9ea46 add lucene restore
Franklin Schmidt <fschmidt@gmail.com>
parents: 753
diff changeset
212 Rpc.functions.lucene_restore = multi_error
749
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
213 end
85f5444fb7d4 add rcp lucene backup
Franklin Schmidt <fschmidt@gmail.com>
parents: 748
diff changeset
214
230
4438cb2e04d0 start lucene
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
215 return index
4438cb2e04d0 start lucene
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
216 end
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
217
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
218 return Lucene