v5 v6: cgi, sample search form (generator), using cgi ENV variables

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/sisu/v5/cgi_pgsql.rb b/lib/sisu/v5/cgi_pgsql.rb
index 4281d9d3..53c73c8d 100644
--- a/lib/sisu/v5/cgi_pgsql.rb
+++ b/lib/sisu/v5/cgi_pgsql.rb
@@ -93,13 +93,13 @@ module  SiSU_CGI_PgSQL
         @name_of[:db]=@env.path.stub_pwd #'sisu' #breaks if not present
         false
       end
-      @name_of[:host_url_cgi]="#{@env.url.webserv_base_cgi(opt)}/cgi-bin"
-      @name_of[:host_url_docs]=@env.url.webserv_files_from_db(opt)
-      @name_of[:cgi_script]=@env.url.cgi_sample_search_form_name(opt)
+      @name_of[:host_url_cgi]=%q{http://#{ENV['HTTP_HOST']}#{ENV['PATH_INFO']}}
+      @name_of[:host_url_docs]=%q{http://#{ENV['HTTP_HOST']}}
+      @name_of[:cgi_script]=%q{#{ENV['SCRIPT_NAME']}}
       @name_of[:user]=@db.psql.user(opt)
-      @cgi_file_name=@name_of[:cgi_script]
-      @image_src="#{@env.url.webserv_base_cgi(opt)}/_sisu/image_sys"
+      @image_src=%q{http://#{ENV['HTTP_HOST']}/_sisu/image_sys}
       @common=SiSU_CGI_SQL::CGI_Common.new(@webserv,opt,@image_src,@env)
+      @cgi_file_name=@env.url.cgi_sample_search_form_name(opt)
     end
     def pgsql
       serve=[]
@@ -200,15 +200,15 @@ module  SiSU_CGI_PgSQL
         puts 'cgi, fcgi or dbi NOT FOUND (LoadError)'
       end
       @stub_default='#{@name_of[:db]}'
-      @image_src='#{@image_src}'
-      @hosturl_cgi='#{@name_of[:host_url_cgi]}'
-      @hosturl_files='#{@name_of[:host_url_docs]}'
+      @image_src="#{@image_src}"
+      @hosturl_cgi="#{@name_of[:host_url_cgi]}"
+      @hosturl_files="#{@name_of[:host_url_docs]}"
       @output_dir_structure_by='#{@name_of[:output_dir_structure]}'
       @lingual='#{@name_of[:lingual]}'
       @port='#{@db.psql.port}'
       @db_name_prefix='#{Db[:name_prefix]}'
       @user='#{@name_of[:user]}'  # check user name for access to pg database: e.g. www-data or '#{@env.user}'
-      @base='#{@name_of[:host_url_cgi]}/#{@name_of[:cgi_script]}'
+      @base="#{@name_of[:host_url_cgi]}#{@name_of[:cgi_script]}"
       WOK_SQL
     end
     def search_statement