diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
commit | a9642d67f69d83d3fdb56ab115ef3c10bcd1895c (patch) | |
tree | 352c633d6b60a54a9ef74ff143162ac07c981b18 /lib/sisu/v3/urls.rb | |
parent | debian/changelog (3.0.7-1) (diff) | |
parent | v3: i18n, sysenv, class variable to prevent unnecessary re-construction of hash (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/urls.rb')
-rw-r--r-- | lib/sisu/v3/urls.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 77952d0b..c963c97e 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -79,12 +79,11 @@ module SiSU_urls def initialize(opt) @opt=opt @particulars=SiSU_Particulars::Combined_singleton.instance.get_env_md(opt) - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @cmd=@opt.cmd @md=@particulars.md @env=@particulars.env @fnb=@env.fnb - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) + fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language @fnl=@env.i18n.lang_filename(fn_set_lang[:c]) @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c]) @m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/ @@ -216,7 +215,7 @@ module SiSU_urls SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result end def sqlite(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.output}/sisu_sqlite.db", "#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db", "#{y}").result end self end |