From 74c346fa583cd93f05b7701dbce2d5bb178ee5c9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 9 Jun 2011 23:01:57 -0400 Subject: v3: cgi, sample search form reverted to '#!/usr/bin/env ruby' * appears to be a fix in libdbi-ruby1.9.1, see comments in sisu-3.0.8 changelog --- lib/sisu/v3/cgi.rb | 6 +++--- lib/sisu/v3/cgi_pgsql.rb | 2 +- lib/sisu/v3/cgi_sqlite.rb | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v3/cgi.rb b/lib/sisu/v3/cgi.rb index f1d628d2..bdecb6ed 100644 --- a/lib/sisu/v3/cgi.rb +++ b/lib/sisu/v3/cgi.rb @@ -64,14 +64,14 @@ module SiSU_CGI class SiSU_search def initialize(opt) @opt=opt - @webserv=@opt.files[0].to_s.strip #verify @opt.files[0].class + @webserv=@opt.files[0].to_s.strip end def search_info a=%{ For help on sisu search, type: sisu --help search - } - SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey + } + SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey end def read SiSU_CGI_sqlite::SiSU_search_sqlite.new(@opt,@webserv).sqlite diff --git a/lib/sisu/v3/cgi_pgsql.rb b/lib/sisu/v3/cgi_pgsql.rb index aa4a02e8..41be70d4 100644 --- a/lib/sisu/v3/cgi_pgsql.rb +++ b/lib/sisu/v3/cgi_pgsql.rb @@ -120,7 +120,7 @@ module SiSU_CGI_pgsql end def header0 <<-WOK_SQL -#!/usr/bin/ruby1.8 +#!/usr/bin/env ruby =begin #{about} * Description: generates naive cgi search form for search of sisu database (pgsql) diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v3/cgi_sqlite.rb index c0ecaeb5..64124cc8 100644 --- a/lib/sisu/v3/cgi_sqlite.rb +++ b/lib/sisu/v3/cgi_sqlite.rb @@ -88,7 +88,6 @@ module SiSU_CGI_sqlite f2 << %{ when /#{Db[:name_prefix]}#{x}/; ''\n} end f2 << " end\n" - #f3 f3 << %{ db_name='sisu_sqlite.db'\n} f3 << %{ db_sqlite=case cgi['db']\n} serve.each do |x| @@ -120,7 +119,7 @@ module SiSU_CGI_sqlite end def header0 <<-WOK_SQL -#!/usr/bin/ruby1.8 +#!/usr/bin/env ruby =begin #{about} * Description: generates naive cgi search form for search of sisu database (sqlite) -- cgit v1.2.3