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

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/sisu/v6/cgi_sqlite.rb b/lib/sisu/v6/cgi_sqlite.rb
index 6db31b48..696b6817 100644
--- a/lib/sisu/v6/cgi_sqlite.rb
+++ b/lib/sisu/v6/cgi_sqlite.rb
@@ -79,6 +79,10 @@ module  SiSU_CGI_SQLite
         opt.lingual.to_s
       else 'multi'
       end
+      @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']}}
+      @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)
       @name_of_sqlite_db_file='sisu_sqlite.db'
@@ -173,13 +177,13 @@ module  SiSU_CGI_SQLite
         puts 'cgi, fcgi or dbi NOT FOUND (LoadError)'
       end
       @stub_default='sisu_sqlite'
-      @image_src='#{@image_src}'
-      @hosturl_cgi='#{@env.url.webserv_base_cgi(@opt)}/cgi-bin'
-      @hosturl_files='#{@env.url.webserv_files_from_db(@opt)}'
+      @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]}'
       @db_name_prefix='#{Db[:name_prefix]}'
-      @base='#{@env.url.webserv_base_cgi(@opt)}/cgi-bin/#{@env.url.cgi_sample_search_form_name(@opt)}' #fix sqlite
+      @base="#{@name_of[:host_url_cgi]}#{@name_of[:cgi_script]}"
       WOK_SQL
     end
     def search_statement