v3: sample search form, revert to generating ruby 1.8.7 sample

* sisu3 using ruby >=1.9.2p180 generates search form for ruby 1.8.7, so:
  generate sample form using sisu3 -F (options), then; start webrick using
  ruby 1.8.7 & sisu -W (not sisu3)
* take account of alternative output directory structures [work on, test]

1 files changed, 9 insertions, 7 deletions

diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v3/cgi_sqlite.rb
index 5a415b0d..4a5838ab 100644
--- a/lib/sisu/v3/cgi_sqlite.rb
+++ b/lib/sisu/v3/cgi_sqlite.rb
@@ -66,6 +66,7 @@ module  SiSU_CGI_sqlite
       @env=SiSU_Env::Info_env.new('',opt)
       @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
       @common=SiSU_CGI_sql::SiSU_CGI_common.new(@webserv,@opt.cmd,@image_src,@env)
+      @cgi_file_name="#{Db[:name_prefix_db]}sqlite.cgi"
     end
     def sqlite
       serve=[]
@@ -95,7 +96,7 @@ module  SiSU_CGI_sqlite
       end
       f3 << %{           else  '#{@env.path.webserv}/#{serve[0]}/sisu_sqlite.db'\n          end\n}
       if FileTest.writable?('.')
-        output=File.open('sisu_sqlite.cgi','w')
+        output=File.open(@cgi_file_name,'w')
         output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2
         a=%{        generated sisu_sqlite.cgi,
             BASED ON ALREADY CREATED sisu_sqlite.db OUTPUT, (-d)
@@ -104,21 +105,22 @@ module  SiSU_CGI_sqlite
         c=case @webserv
         when /pwd/; ''
         else "if necessary make the directory /usr/lib/cgi-bin :
-                  sudo cp -vi #{Dir.pwd}/sisu_sqlite.cgi /usr/lib/cgi-bin/.
-                  sudo chmod -v 755 /usr/lib/cgi-bin/sisu_sqlite.cgi
-                  (copy sisu_sqlite.cgi to your cgi directory) and set file permissions to 755"
+                  sudo cp -vi #{Dir.pwd}/#{@cgi_file_name} /usr/lib/cgi-bin/.
+                  sudo chmod -v 755 /usr/lib/cgi-bin/#{@cgi_file_name}
+                  sudo ln -s /usr/lib/cgi-bin/#{@cgi_file_name} /usr/lib/cgi-bin/sisu_sqlite.cgi
+                  (copy #{@cgi_file_name} to your cgi directory) set file permissions to 755, and make symbolic link to sisu_sqlite.cgi"
         end
         a=%{#{c}
                   #{@env.webserv_base_cgi}/cgi-bin/sisu_sqlite.cgi
         }
         b='(to create and populate sisu sqlite database see "man sisu" and in particular the -d flag)'
         SiSU_Screen::Ansi.new(@opt.cmd,a,b).warn
-      else puts 'failed in attempt to write sisu_sqlite.cgi to present directory, is directory writable?'
+      else puts "failed in attempt to write #{@cgi_file_name} to present directory, is directory writable?"
       end
     end
     def header0
       <<-WOK_SQL
-#!/usr/bin/env ruby
+#!/usr/bin/ruby1.8
 =begin
 #{about}
  * Description: generates naive cgi search form for search of sisu database (sqlite)
@@ -141,7 +143,7 @@ module  SiSU_CGI_sqlite
           @l,@t,@q=l,t,q
         end
         def string
-          search={ search: [], flag: false }
+          search={ :search => [], :flag => false }
           if @t =~/\S+/ or @q =~/\S+/
             if @t =~/\S+/;     unescaped_search=CGI.unescape(@t)
             elsif @q =~/\S+/;  unescaped_search=CGI.unescape(@q)