diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-10-19 21:17:49 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-10-19 21:17:49 -0400 |
commit | 18ee3095eb3c7119c6d10a4b9e107d907c7aac19 (patch) | |
tree | 3013475489fcc92e9d038ed3628d91d50cb2a4da /lib/sisu/v6/cgi_pgsql.rb | |
parent | v5 v6: db, text search & display field, footnotes moved to end of text object (diff) |
v5 v6: cgi, sample search form, find & display endnotes from parent text objectsisu_5.7.1
* remove dedicated endnote search section (as endnotes found & listed from
reference text field)
* cleaner search results
Diffstat (limited to 'lib/sisu/v6/cgi_pgsql.rb')
-rw-r--r-- | lib/sisu/v6/cgi_pgsql.rb | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/sisu/v6/cgi_pgsql.rb b/lib/sisu/v6/cgi_pgsql.rb index 9feffd40..49ab0e50 100644 --- a/lib/sisu/v6/cgi_pgsql.rb +++ b/lib/sisu/v6/cgi_pgsql.rb @@ -233,11 +233,9 @@ module SiSU_CGI_PgSQL #% 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*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+doc_objects\.clean~[*]?\(\s*'[^']+'\s*\))+)/,'(\1)') - @search_endnotes=search[:endnotes].flatten.join(' AND ') - @search_endnotes=@search_endnotes.gsub(/(endnotes\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)') end WOK_SQL end @@ -251,26 +249,12 @@ module SiSU_CGI_PgSQL #% 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.exec(sql_select_body) end - def endnotes - @conn.exec(sql_select_endnotes) - end end WOK_SQL end |