aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2011-06-09 23:01:57 -0400
committerRalph Amissah <ralph@amissah.com>2011-06-09 23:07:11 -0400
commit74c346fa583cd93f05b7701dbce2d5bb178ee5c9 (patch)
treec84c6a125f78175b77928cac3d3cfe90541da3b1 /lib/sisu
parentv3: harvest, work for alt output structures; for each language (diff)
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
Diffstat (limited to 'lib/sisu')
-rw-r--r--lib/sisu/v3/cgi.rb6
-rw-r--r--lib/sisu/v3/cgi_pgsql.rb2
-rw-r--r--lib/sisu/v3/cgi_sqlite.rb3
3 files changed, 5 insertions, 6 deletions
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}/; '<option value="#{Db[:name_prefix]}#{x}">#{x}</option>'\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)