diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-04-19 14:44:38 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-05-01 18:49:40 -0400 |
| commit | 1323f18af45ea0d3aaef5cd9ead0efb5de8b9729 (patch) | |
| tree | e1abd6d04547c269666f276d8bdb24afa9d7dfee /lib/sisu/current/cgi_sql_common.rb | |
| parent | setup.rb s/Config/RbConfig/ (diff) | |
c<-d: sync, roll develop into current dir branch (5==6)
* two dir branches, same library contents
(v5 synced & updated with v6)
Diffstat (limited to 'lib/sisu/current/cgi_sql_common.rb')
| -rw-r--r-- | lib/sisu/current/cgi_sql_common.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/sisu/current/cgi_sql_common.rb b/lib/sisu/current/cgi_sql_common.rb index 94f6126e..62bec041 100644 --- a/lib/sisu/current/cgi_sql_common.rb +++ b/lib/sisu/current/cgi_sql_common.rb @@ -537,14 +537,14 @@ module SiSU_CGI_SQL <!-- SiSU Rights --> <p class="tiny_left"><font color="#666666" size="2"> Generated by - #{v[:project]} #{v[:version]} #{v[:date]} (#{v[:date_stamp]}) + #{v.project} #{v.version} #{v.date} (#{v.date_stamp}) <br> <a href="http://www.sisudoc.org" > - <b>#{v[:project]}</b></a> <sup>©</sup> Ralph Amissah + <b>#{v.project}</b></a> <sup>©</sup> Ralph Amissah 1993, current 2014. All Rights Reserved. <br> - #{v[:project]} is software for document structuring, publishing and search, + #{v.project} is software for document structuring, publishing and search, <br> <a href="http://www.jus.uio.no/sisu" > www.jus.uio.no/sisu @@ -574,7 +574,7 @@ module SiSU_CGI_SQL </font></p> </td><td valign="top" width="45%"> <p class="tiny_left"><font color="#666666" size="2"> - #{v[:project]} using: + #{v.project} using: <br>Standard SiSU markup syntax, <br>Standard SiSU meta-markup syntax, and the <br>Standard SiSU <u>object citation numbering</u> and system, (object/text identifying/locating system) @@ -601,7 +601,7 @@ module SiSU_CGI_SQL </font></p> </td><td valign="top" width="45%"> <p class="tiny_left"><font color="#666666" size="2"> - #{v[:project]}, developed using + #{v.project}, developed using <a href="http://www.ruby-lang.org/en/"> Ruby </a> @@ -908,13 +908,11 @@ module SiSU_CGI_SQL else nil end @search_regx=if unescaped_search #check - search_regex=[] - build=unescaped_search.scan(/\S+/).each do |g| + search_regex=unescaped_search.scan(/\S+/).each.map do |g| (g.to_s =~/(AND|OR)/) \ - ? (search_regex << '|') - : (search_regex << %{#{g.to_s}}) - end - search_regex=search_regex.join(' ') + ? ('|') + : (%{#{g.to_s}}) + end.join(' ') search_regex=search_regex.gsub(/\s*\|\s*/,'|') Regexp.new(search_regex, Regexp::IGNORECASE) else nil |