aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v4
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-05-19 00:36:56 -0400
committerRalph Amissah <ralph@amissah.com>2013-05-19 00:36:56 -0400
commit2e173f06d2a01e77c78592652ab31532d6e42f83 (patch)
tree5db9895562b5b9fe7a62960e0381750848d1eae6 /lib/sisu/v4
parentdebian/changelog (4.1.0-2) (diff)
parentv4 v5: cgi script for sample search form generator, sqlite, minor fixes (diff)
Merge tag 'sisu_4.1.1' into debian/sid
SiSU 4.1.1
Diffstat (limited to 'lib/sisu/v4')
-rw-r--r--lib/sisu/v4/cgi_pgsql.rb14
-rw-r--r--lib/sisu/v4/cgi_sqlite.rb11
2 files changed, 12 insertions, 13 deletions
diff --git a/lib/sisu/v4/cgi_pgsql.rb b/lib/sisu/v4/cgi_pgsql.rb
index fd688244..70a60d81 100644
--- a/lib/sisu/v4/cgi_pgsql.rb
+++ b/lib/sisu/v4/cgi_pgsql.rb
@@ -158,13 +158,13 @@ module SiSU_CGI_PgSQL
require 'cgi'
require 'fcgi'
require 'dbi'
- @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]}"
- @port="#{@db.psql.port}"
- @db_name_prefix="#{Db[:name_prefix]}"
+ @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]}'
+ @port='#{@db.psql.port}'
+ @db_name_prefix='#{Db[:name_prefix]}'
user='www-data' # check user name for access to pg database: e.g. www-data or '#{@env.user}'
WOK_SQL
end
diff --git a/lib/sisu/v4/cgi_sqlite.rb b/lib/sisu/v4/cgi_sqlite.rb
index d82cf8ec..05c7e6a7 100644
--- a/lib/sisu/v4/cgi_sqlite.rb
+++ b/lib/sisu/v4/cgi_sqlite.rb
@@ -131,12 +131,11 @@ module SiSU_CGI_SQLite
require 'cgi'
require 'fcgi'
require 'dbi'
- @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]}"
+ @stub_default='sisu_sqlite'
+ @image_src='#{@env.url.webserv_cgi}/_sisu/image_sys'
+ @hosturl_cgi='#{@env.url.webserv_base_cgi}/cgi-bin'
+ @hosturl_files='#{@env.url.webserv_files_from_db}'
+ @db_name_prefix='#{Db[:name_prefix]}'
WOK_SQL
end
def search_statement