From ffe139ebc8681df0ed48762eb9601136dda41546 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 9 May 2013 22:10:16 -0400
Subject: v4: cgi script for sample search form, minor fixes

---
 data/doc/sisu/CHANGELOG_v4    | 2 ++
 lib/sisu/v4/cgi_pgsql.rb      | 2 +-
 lib/sisu/v4/cgi_sql_common.rb | 2 +-
 lib/sisu/v4/cgi_sqlite.rb     | 9 +++++----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index adee802a..ada24fdd 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.0.orig.tar.xz
 
 * v4: defaults, sysenv, simplify default home page (by default is not used)
 
+* v4: cgi script for sample search form, minor fixes
+
 %% 4.0.21.orig.tar.xz (2013-05-06:18/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.21
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.21-1
diff --git a/lib/sisu/v4/cgi_pgsql.rb b/lib/sisu/v4/cgi_pgsql.rb
index d621d187..fd688244 100644
--- a/lib/sisu/v4/cgi_pgsql.rb
+++ b/lib/sisu/v4/cgi_pgsql.rb
@@ -160,7 +160,7 @@ module  SiSU_CGI_PgSQL
       require 'dbi'
       @stub_default="#{@name_of[:db]}"
       @image_src="#{@name_of[:host_url_docs]}/_sisu/image_sys"
-      @hosturl_db="#{@name_of[:host_url_cgi]}"
+      @hosturl_cgi="#{@name_of[:host_url_cgi]}"
       @hosturl_files="#{@name_of[:host_url_docs]}"
       @output_dir_structure_by="#{@name_of[:output_dir_structure]}"
       @port="#{@db.psql.port}"
diff --git a/lib/sisu/v4/cgi_sql_common.rb b/lib/sisu/v4/cgi_sql_common.rb
index 5e356a58..6c0550e6 100644
--- a/lib/sisu/v4/cgi_sql_common.rb
+++ b/lib/sisu/v4/cgi_sql_common.rb
@@ -130,7 +130,7 @@ module SiSU_CGI_SQL
       <<-'WOK_SQL'
 #Common TOP
       @@offset=0
-      @base="#{@hosturl_db}/#{@stub_default}.cgi" #fix sqlite
+      @base="#{@hosturl_cgi}/#{@stub_default}.cgi" #fix sqlite
       @@canned_search_url=@base
       @color_heading='#DDFFAA'
       @color_match='#ffff48'
diff --git a/lib/sisu/v4/cgi_sqlite.rb b/lib/sisu/v4/cgi_sqlite.rb
index 6f8bc4cc..d82cf8ec 100644
--- a/lib/sisu/v4/cgi_sqlite.rb
+++ b/lib/sisu/v4/cgi_sqlite.rb
@@ -131,10 +131,11 @@ module  SiSU_CGI_SQLite
       require 'cgi'
       require 'fcgi'
       require 'dbi'
-      @version='sisu_sqlite'
-      @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
-      @hosturl_db="#{@env.url.webserv_base_cgi}/cgi-bin"
-      @hosturl_files="#{@env.url.webserv_files_from_db}"
+      @stub_default="#{@name_of[:db]}"
+      @image_src="#{@name_of[:host_url_docs]}/_sisu/image_sys"
+      @hosturl_cgi="#{@name_of[:host_url_cgi]}"
+      @hosturl_files="#{@name_of[:host_url_docs]}"
+      @output_dir_structure_by="#{@name_of[:output_dir_structure]}"
       @db_name_prefix="#{Db[:name_prefix]}"
       WOK_SQL
     end
-- 
cgit v1.2.3