From 46eebe8bbf6c0102c2f921f65778a99121c91ff2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 4 May 2011 22:19:42 -0400 Subject: v3: options, language setting, based on directory structure or filename * affects multiple libraries --- lib/sisu/v3/urls.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/sisu/v3/urls.rb') diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 77952d0b..14788c00 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)$/ -- cgit v1.2.3 From 5f0bc4a777cb5c32041812713d00be7245a3ee22 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 4 May 2011 23:15:37 -0400 Subject: v3: urls, sqlite, a fix --- lib/sisu/v3/urls.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sisu/v3/urls.rb') diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 14788c00..c963c97e 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -215,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 -- cgit v1.2.3