diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-05-17 18:12:11 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-05-17 18:12:11 -0400 |
commit | e28ee29ba60d6a97598eeb93d67ae36256c69697 (patch) | |
tree | 21243fcd58f773f38d0613dba47f2bf597953609 /lib/sisu/v3/cgi_sqlite.rb | |
parent | debian/changelog (3.0.8-1) (diff) | |
parent | v3: po4a re-enabled, related fixes (issues persist) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/cgi_sqlite.rb')
-rw-r--r-- | lib/sisu/v3/cgi_sqlite.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v3/cgi_sqlite.rb index 4a5838ab..92178b4e 100644 --- a/lib/sisu/v3/cgi_sqlite.rb +++ b/lib/sisu/v3/cgi_sqlite.rb @@ -65,8 +65,8 @@ module SiSU_CGI_sqlite @opt,@webserv=opt,webserv @env=SiSU_Env::Info_env.new('',opt) @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys" - @common=SiSU_CGI_sql::SiSU_CGI_common.new(@webserv,@opt.cmd,@image_src,@env) - @cgi_file_name="#{Db[:name_prefix_db]}sqlite.cgi" + @common=SiSU_CGI_sql::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env) + @cgi_file_name="#{Db[:name_prefix_db]}by_#{opt.dir_structure_by}_sqlite.cgi" end def sqlite serve=[] @@ -97,7 +97,7 @@ module SiSU_CGI_sqlite f3 << %{ else '#{@env.path.webserv}/#{serve[0]}/sisu_sqlite.db'\n end\n} if FileTest.writable?('.') output=File.open(@cgi_file_name,'w') - output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 + output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3 a=%{ generated sisu_sqlite.cgi, BASED ON ALREADY CREATED sisu_sqlite.db OUTPUT, (-d) } |