Mercurial Hosting > luan

annotate src/luan/modules/lucene/Web_search.luan @ 1573:c6b50b7b958c

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