Mercurial Hosting > luan
annotate src/luan/modules/lucene/Web_search.luan @ 1565:44e444a8da64
minor
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Wed, 11 Nov 2020 13:17:58 -0700 |
parents | f7649ad6e3e7 |
children | c6b50b7b958c |
rev | line source |
---|---|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
775
diff
changeset
|
1 local Luan = require "luan:Luan.luan" |
548
f4dfe9c64c25
shorten some String function names
Franklin Schmidt <fschmidt@gmail.com>
parents:
545
diff
changeset
|
2 local error = Luan.error |
f4dfe9c64c25
shorten some String function names
Franklin Schmidt <fschmidt@gmail.com>
parents:
545
diff
changeset
|
3 local pairs = Luan.pairs or error() |
f4dfe9c64c25
shorten some String function names
Franklin Schmidt <fschmidt@gmail.com>
parents:
545
diff
changeset
|
4 local ipairs = Luan.ipairs or error() |
f4dfe9c64c25
shorten some String function names
Franklin Schmidt <fschmidt@gmail.com>
parents:
545
diff
changeset
|
5 local range = Luan.range or error() |
1189 | 6 local stringify = Luan.stringify or error() |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
7 local eval = Luan.eval or error() |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
8 local type = Luan.type or error() |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
561
diff
changeset
|
9 local Io = require "luan:Io.luan" |
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
561
diff
changeset
|
10 local Http = require "luan:http/Http.luan" |
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
561
diff
changeset
|
11 local String = require "luan:String.luan" |
548
f4dfe9c64c25
shorten some String function names
Franklin Schmidt <fschmidt@gmail.com>
parents:
545
diff
changeset
|
12 local string_to_number = String.to_number or error() |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
561
diff
changeset
|
13 local Html = require "luan:Html.luan" |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
14 local html_encode = Html.encode or error() |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
15 local Number = require "luan:Number.luan" |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
16 local Table = require "luan:Table.luan" |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
17 local size = Table.size or error() |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
18 |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
19 |
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
775
diff
changeset
|
20 local Web_search = {} |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
21 |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
22 local function style() |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
23 %> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
24 body { |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
25 font-family: sans-serif; |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
26 margin: 2em 5%; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
27 } |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
28 h2 { |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
29 margin-bottom: .5em; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
30 } |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
31 label { |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
32 text-align: right; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
33 min-width: 6em; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
34 display: inline-block; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
35 margin-right: .5em; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
36 } |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
37 input, textarea { |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
38 margin-top: 1em; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
39 font: inherit; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
40 } |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
41 span[tip] { |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
42 color: #888; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
43 font-size: smaller; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
44 } |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
45 input[type="submit"] { |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
46 cursor: pointer; |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
47 padding: .5em; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
48 border-radius: 4px; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
49 } |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
50 textarea[name="old"] { |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
51 display: none; |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
52 } |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
53 <% |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
54 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
55 |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
56 local function form() |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
57 %> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
58 <!doctype html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
59 <html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
60 <head> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
61 <title>Lucene</title> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
62 <style> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
63 <% style() %> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
64 </style> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
65 </head> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
66 <body> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
67 <h2>Lucene Query</h2> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
68 <form> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
69 <div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
70 <label>Query:</label> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
71 <input type=text name="query" size="80" autofocus> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
72 </div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
73 <div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
74 <label></label> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
75 <span tip>Query examples: <i>type:user</i> or <i>+type:user +name:Joe"</i></span> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
76 </div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
77 <div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
78 <label>Max Rows:</label> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
79 <input type=text name="rows" value="100" size="3" maxlength="5"> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
80 </div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
81 <div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
82 <label>Sort:</label> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
83 <input type=text name="sort" size="60"> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
84 </div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
85 <div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
86 <label></label> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
87 <span tip>Sort examples: <i>name, id</i></span> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
88 </div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
89 <div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
90 <label></label> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
91 <input type="submit"> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
92 </div> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
93 </form> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
94 </body> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
95 </html> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
96 <% |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
97 end |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
98 |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
99 |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
100 local function index_of(tbl,val) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
101 for i, v in ipairs(tbl) do |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
102 if v == val then |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
103 return i |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
104 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
105 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
106 local n = #tbl + 1 |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
107 tbl[n] = val |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
108 return n |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
109 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
110 |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
111 local function result(index) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
112 local query = Http.request.parameters.query |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
113 local rows = string_to_number(Http.request.parameters.rows) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
114 local sort = Http.request.parameters.sort |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
115 local results = index.search(query,1,rows,{sort=sort}) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
116 local headers = {} |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
117 local table = {} |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
118 for _, doc in ipairs(results) do |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
119 local row = {} |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
120 for field, value in pairs(doc) do |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
121 row[index_of(headers,field)] = value |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
122 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
123 row.doc = doc |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
124 table[#table+1] = row |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
125 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
126 %> |
1216 | 127 <!doctype html> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
128 <html> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
129 <head> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
130 <title>Lucene</title> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
131 <style> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
132 <% style() %> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
133 table { |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
134 border-collapse: collapse; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
135 width: 100%; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
136 font-size: smaller; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
137 } |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
138 th, td { |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
139 text-align: left; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
140 padding: .5em; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
141 border: solid 1px #ddd; |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
142 } |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
143 </style> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
144 </head> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
145 <body> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
146 <h2>Lucene Results</h2> |
1407 | 147 <p><label>Query:</label> <b><%=html_encode(query)%></b></p> |
148 <p><label>Sort:</label> <b><%=html_encode(sort)%></b></p> | |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
149 <table> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
150 <tr> |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
151 <th></th> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
152 <% for _, header in ipairs(headers) do %> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
153 <th><%=header%></th> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
154 <% end %> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
155 </tr> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
156 <% |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
157 for i, row in ipairs(table) do |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
158 local id = row.doc.id |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
159 %> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
160 <tr> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
161 <td> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
162 <a href="?id=<%=id%>"><%=i%></a> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
163 </td> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
164 <% |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
165 for col in range(1, #headers) do |
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
166 local val = row[col] |
1189 | 167 %><td><%= val and stringify(val) or "" %></td><% |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
168 end |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
169 %> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
170 </tr> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
171 <% end %> |
561
363d07e26549
remove SimplyHTML from lucene/Web_search
Franklin Schmidt <fschmidt@gmail.com>
parents:
550
diff
changeset
|
172 </table> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
173 </body> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
340
diff
changeset
|
174 </html> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
175 <% |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
176 end |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
177 |
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
178 |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
179 local function edit(index) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
180 local id = string_to_number(Http.request.parameters.id) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
181 local doc = index.get_document("id:"..id) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
182 doc = stringify(doc,{strict=true,number_types=true}) |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
183 doc = html_encode(doc) |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
184 %> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
185 <!doctype html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
186 <html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
187 <head> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
188 <title>Lucene</title> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
189 <style> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
190 <% style() %> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
191 </style> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
192 </head> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
193 <body> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
194 <h2>Lucene Edit</h2> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
195 <form action="?" method=post> |
1412 | 196 <input hidden name=id value="<%=id%>"> |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
197 <textarea name="old" ><%=doc%></textarea> |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
198 <div><textarea name="doc" rows="20" cols="90" autofocus><%=doc%></textarea></div> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
199 <div><input type="submit" value="Update"></div> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
200 </form> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
201 </body> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
202 </html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
203 <% |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
204 end |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
205 |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
206 |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
207 local function equal(tbl1,tbl2) |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
208 if size(tbl1) ~= size(tbl2) then |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
209 return false |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
210 end |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
211 for key, value1 in pairs(tbl1) do |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
212 local value2 = tbl2[key] |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
213 if type(value1) == "table" then |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
214 if type(value2) ~= "table" or not equal(value1,value2) then |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
215 return false |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
216 end |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
217 elseif value1 ~= value2 then |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
218 return false |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
219 end |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
220 end |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
221 return true |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
222 end |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
223 |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
224 local function update(index) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
225 local doc = Http.request.parameters.doc |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
226 doc = eval( doc, "lucene", Number ) |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
227 local old = Http.request.parameters.old |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
228 old = eval( old, "lucene", Number ) |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
229 local id = Http.request.parameters.id |
1537 | 230 local msg = "Lucene Updated" |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
231 index.run_in_transaction( function() |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
232 local current = index.get_document("id:"..id) |
1537 | 233 if not equal(current,old) then |
234 msg = "ERROR: document has changed" | |
235 return | |
236 end | |
1536
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
237 if doc == nil then |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
238 index.delete("id:"..id) |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
239 else |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
240 index.save(doc) |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
241 end |
34ae786771b6
make Web_search transaction safe
Franklin Schmidt <fschmidt@gmail.com>
parents:
1456
diff
changeset
|
242 end ) |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
243 %> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
244 <!doctype html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
245 <html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
246 <head> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
247 <title>Lucene</title> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
248 <style> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
249 <% style() %> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
250 </style> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
251 </head> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
252 <body> |
1537 | 253 <h2><%=msg%></h2> |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
254 </body> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
255 </html> |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
256 <% |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
257 end |
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
258 |
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
259 |
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
775
diff
changeset
|
260 function Web_search.of(index) |
549 | 261 index or error "index is nil" |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
262 |
505
7bc63886d4f2
web page modules now return a function
Franklin Schmidt <fschmidt@gmail.com>
parents:
503
diff
changeset
|
263 return function() |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
264 Io.stdout = Http.response.text_writer() |
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1088
diff
changeset
|
265 local query = Http.request.parameters.query |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
266 if Http.request.parameters.query ~= nil then |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
267 result(index) |
1412 | 268 elseif Http.request.parameters.doc ~= nil then |
269 update(index) | |
1395
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
270 elseif Http.request.parameters.id ~= nil then |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
271 edit(index) |
9dfff82dfc59
finish postgres work
Franklin Schmidt <fschmidt@gmail.com>
parents:
1355
diff
changeset
|
272 else |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
273 form() |
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
274 end |
505
7bc63886d4f2
web page modules now return a function
Franklin Schmidt <fschmidt@gmail.com>
parents:
503
diff
changeset
|
275 end |
285
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
276 |
582e8db4cdb6
add lucene Web_search
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
277 end |
503 | 278 |
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
775
diff
changeset
|
279 return Web_search |