diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:21:14 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:21:14 -0400 |
commit | 03f79b10f928c7bb7791b7ea3ee9e8222eb15cc9 (patch) | |
tree | 9f1f7de42705f734d8d456f3708db19146804ecf /lib/sisu/v6/cgi.rb | |
parent | debian/changelog (5.5.5-1) (diff) | |
parent | v6: hub, further changes related to use of opt.act; hub file split (diff) |
Merge tag 'sisu_5.5.6' into debian/sid
SiSU 5.5.6
Diffstat (limited to 'lib/sisu/v6/cgi.rb')
-rw-r--r-- | lib/sisu/v6/cgi.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v6/cgi.rb b/lib/sisu/v6/cgi.rb index a4065344..9a0dab33 100644 --- a/lib/sisu/v6/cgi.rb +++ b/lib/sisu/v6/cgi.rb @@ -61,8 +61,8 @@ (pgsql sqlite) =end -module SiSU_CGI #% database building documents - require_relative 'sysenv' # sysenv.rb +module SiSU_CGI #% database building documents + require_relative 'se' # se.rb require_relative 'cgi_pgsql' # cgi_pgsql.rb require_relative 'cgi_sqlite' # cgi_sqlite.rb class SearchSQL @@ -71,9 +71,9 @@ module SiSU_CGI @webserv=@opt.files[0].to_s.strip end def read - if @opt.mod.inspect =~/--db[=-]["']?(?:pg|pg?sql|postgres(?:ql)?)["']+/ + if @opt.act[:psql][:set]==:on SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql - elsif @opt.mod.inspect =~/--db[=-](?:sqlite)/ + elsif @opt.act[:sqlite][:set]==:on SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite else puts <<-WOK |