Skip to content

Commit d345f41

Browse files
remove use of sqlite for item and plugin page searches
1 parent 1ca9321 commit d345f41

File tree

1 file changed

+2
-27
lines changed

1 file changed

+2
-27
lines changed

server.rb

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -144,20 +144,7 @@ def split find, query
144144
when 'sites'
145145
search sites(find, query, match)
146146
when 'pages'
147-
if find=='plugins' || find=='items'
148-
find = find.gsub(/s$/,'')
149-
if match == 'or'
150-
cond = (query.map {|value| "#{find} = \"#{value}\"" }).join(" or ")
151-
sql = "select distinct site,slug from pages where #{cond} limit 100"
152-
else
153-
cond = query.map {|value| "select site,slug from pages where #{find} = \"#{value}\""}
154-
sql = cond.join(" intersect ")
155-
end
156-
puts sql
157-
format selected `sqlite3 public/pages.db '#{sql}'`
158-
else
159-
format references pages(find, query, sites(find, query, match), match)
160-
end
147+
format references pages(find, query, sites(find, query, match), match)
161148
else
162149
"Don't yet know within: '#{params['within']}'"
163150
end
@@ -183,19 +170,7 @@ def split find, query
183170
find = params['find'] || 'words'
184171
match = params['match'] || 'and'
185172
query = split find, params['query']
186-
if find=='plugins' || find=='items'
187-
find = find.gsub(/s$/,'')
188-
if match == 'or'
189-
cond = (query.map {|value| "#{find} = \"#{value}\"" }).join(" or ")
190-
sql = "select distinct site,slug from pages where #{cond} limit 100"
191-
else
192-
cond = query.map {|value| "select site,slug from pages where #{find} = \"#{value}\""}
193-
sql = cond.join(" intersect ")
194-
end
195-
result = selected `sqlite3 public/pages.db '#{sql}'`
196-
else
197-
result = references pages(find, query, sites(find, query, match), match)
198-
end
173+
result = references pages(find, query, sites(find, query, match), match)
199174
halt 200, {:params => params, :result => result}.to_json
200175
end
201176

0 commit comments

Comments
 (0)