aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/cgi_sql_common.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3/cgi_sql_common.rb')
-rw-r--r--lib/sisu/v3/cgi_sql_common.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/sisu/v3/cgi_sql_common.rb b/lib/sisu/v3/cgi_sql_common.rb
index 94026ce7..18e1ab1e 100644
--- a/lib/sisu/v3/cgi_sql_common.rb
+++ b/lib/sisu/v3/cgi_sql_common.rb
@@ -301,9 +301,9 @@ module SiSU_CGI_SQL
end
def text_to_match(identifier='')
m={
- :string => /#{identifier}\s*(.+?)/,
- :string => /#{identifier}\s*(.+?)(?:;|\n|\r|$)/,
- :word => /#{identifier}[\s(]*(\S+)/
+ string: /#{identifier}\s*(.+?)/,
+ string: /#{identifier}\s*(.+?)(?:;|\n|\r|$)/,
+ word: /#{identifier}[\s(]*(\S+)/
}
search_string=if @search_field =~m[:word]
search_string=if @search_field =~m[:braces] then m[:braces].match(@search_field)[1]
@@ -313,7 +313,7 @@ module SiSU_CGI_SQL
str=str.gsub(/[()]/,'')
str
end
- search_string=search_string.strip.search_string.gsub(/\s+/,'+')
+ search_string=search_string.strip.gsub(/\s+/,'+')
#else
# "__"
end
@@ -328,10 +328,10 @@ module SiSU_CGI_SQL
def initialize(conn,search_for,q,c)
@conn=conn
@text_search_flag=false
- @sql_statement={ :body => '', :endnotes => '', :range => '' }
+ @sql_statement={ body: '', endnotes: '', range: '' }
#@offset||=@@offset
#@offset+=@@limit
- search={ :text => [], :endnotes => [] }
+ search={ text: [], endnotes: [] }
cse=(c =~/\S/) ? true : false
st=DBI_SearchString.new('doc_objects.clean',search_for.text1,q['s1'],cse).string
se=DBI_SearchString.new('endnotes.clean',search_for.text1,q['s1'],cse).string
@@ -650,7 +650,7 @@ module SiSU_CGI_SQL
@counters_txt,@counters_endn,@sql_select_body,@sql_select_endnotes='','','',''
FCGI.each_cgi do |cgi|
begin # all code goes in begin section
- @search={ :text => [], :endnotes => [] }
+ @search={ text: [], endnotes: [] }
q=CGI.new
@db=if cgi['db'] =~/\S+/
@stub=/#{@db_name_prefix}(\S+)/.match(cgi['db'])[1]
@@ -661,13 +661,13 @@ module SiSU_CGI_SQL
end
checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','',''
result_type=(cgi['view']=~/text/) \
- ? result_type={ :index => '', :text => 'checked'}
- : result_type={ :index => 'checked', :text => ''}
+ ? result_type={ index: '', text: 'checked'}
+ : result_type={ index: 'checked', text: ''}
@@limit=if cgi['sql_match_limit'].to_s=~/2500/
- checked_sql_limit={ :l1000 => '', :l2500 => 'checked'}
+ checked_sql_limit={ l1000: '', l2500: 'checked'}
'2500'
else
- checked_sql_limit={ :l1000 => 'checked', :l2500 => ''}
+ checked_sql_limit={ l1000: 'checked', l2500: ''}
'1000'
end
checked_echo='checked' if cgi['echo'] =~/\S/