From 31d9927f356d05c24d5495bb3e4d59597bcea6eb Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 19 Dec 2009 16:28:24 -0500
Subject: minor code adjustments

---
 lib/sisu/v1/cgi_pgsql.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/sisu/v1/cgi_pgsql.rb')

diff --git a/lib/sisu/v1/cgi_pgsql.rb b/lib/sisu/v1/cgi_pgsql.rb
index 4f201dfa..f6f62bfb 100644
--- a/lib/sisu/v1/cgi_pgsql.rb
+++ b/lib/sisu/v1/cgi_pgsql.rb
@@ -153,11 +153,11 @@ module  SiSU_CGI_pgsql
             end
             search_construct=[]
             if @c
-              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~\( '")
-              unescaped_search.gsub!(/(.+)/,"#@l~\( '\\1' \)")
+              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #{@l}~\( '")
+              unescaped_search.gsub!(/(.+)/,"#{@l}~\( '\\1' \)")
             else
-              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~*\( '")
-              unescaped_search.gsub!(/(.+)/,"#@l~*\( '\\1' \)")
+              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #{@l}~*\( '")
+              unescaped_search.gsub!(/(.+)/,"#{@l}~*\( '\\1' \)")
             end
             search_construct << unescaped_search
             search_construct=search_construct.join(' ')
@@ -188,7 +188,7 @@ module  SiSU_CGI_pgsql
         def sql_select_body
           limit ||=@@limit
           offset ||=@@offset
-          @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE (#@search_text) AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn}
+          @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE (#{@search_text}) AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn}
           @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
           select=@sql_statement[:body] + ' ' + @sql_statement[:range]
           select
@@ -196,7 +196,7 @@ module  SiSU_CGI_pgsql
         def sql_select_endnotes
           limit ||=@@limit
           offset ||=@@offset
-          @sql_statement[:endnotes]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE (#@search_endnotes) AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr}
+          @sql_statement[:endnotes]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE (#{@search_endnotes}) AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr}
           @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
           select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range]
           select
@@ -218,7 +218,7 @@ module  SiSU_CGI_pgsql
     end
     def buttons1_pgsql
       <<-'WOK_SQL'
-            <input type="checkbox" name="casesense" #@checked_case> case sensitive
+            <input type="checkbox" name="casesense" #{@checked_case}> case sensitive
       WOK_SQL
     end
     def dbi_connect
-- 
cgit v1.2.3