diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-10-19 21:19:47 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-10-19 21:19:47 -0400 |
commit | fa19bd4cdb7f9f9db99c99604250ceda77e527a8 (patch) | |
tree | 3689106b15c764c720d11fbe6da0d25418094d69 /lib/sisu/v5/cgi_sqlite.rb | |
parent | debian/changelog (5.7.0-1) (diff) | |
parent | v5 v6: cgi, sample search form, find & display endnotes from parent text object (diff) |
Merge tag 'sisu_5.7.1' into debian/sid
SiSU 5.7.1
Diffstat (limited to 'lib/sisu/v5/cgi_sqlite.rb')
-rw-r--r-- | lib/sisu/v5/cgi_sqlite.rb | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb index 2b4e668f..8f3f58eb 100644 --- a/lib/sisu/v5/cgi_sqlite.rb +++ b/lib/sisu/v5/cgi_sqlite.rb @@ -211,11 +211,9 @@ module SiSU_CGI_SQLite #% database building doc end def search_query1 <<-'WOK_SQL' - @search_text,@search_endnotes='','' + @search_text='' @search_text=search[:text].flatten.join(' AND ') @search_text=@search_text.gsub(/(doc_objects\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+doc_objects\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)') - @search_endnotes=search[:endnotes].flatten.join(' AND ') - @search_endnotes=@search_endnotes.gsub(/(endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)') end WOK_SQL end @@ -229,26 +227,12 @@ module SiSU_CGI_SQLite #% database building doc select=@sql_statement[:body] + ' ' + @sql_statement[:range] select end - def sql_select_endnotes - limit ||=@@limit - offset ||=@@offset - @sql_statement[:endnotes]=%{SELECT metadata_and_text.title, metadata_and_text.creator_author, metadata_and_text.src_filename, metadata_and_text.language_document_char, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata_and_text, endnotes WHERE #{@search_endnotes} AND metadata_and_text.tid = endnotes.metadata_tid ORDER BY metadata_and_text.language_document_char, metadata_and_text.title, metadata_and_text.src_filename, endnotes.nr} - @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;} - select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range] - select - end def sql_select_body_format %{<font color="#666666" size="2">#{sql_select_body}</font>} end - def sql_select_endnotes_format - %{<font color="#666666" size="2">#{sql_select_endnotes}</font>} - end def contents @conn.execute(sql_select_body) end - def endnotes - @conn.execute(sql_select_endnotes) - end end WOK_SQL end |