diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-03-29 21:48:25 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-03-29 21:48:25 -0400 |
commit | 5fb1d73615bbe3839767964a4028b65e07ecdf23 (patch) | |
tree | 388bfcf8a1178870e7f8375fa0f3dc5ac6304d06 /lib/sisu/v4/dal.rb | |
parent | debian/changelog (4.0.17-1) (diff) | |
parent | v4: version & changelog, dates touched (diff) |
Merge tag 'sisu_4.0.18' into debian/sid
SiSU 4.0.18
Diffstat (limited to 'lib/sisu/v4/dal.rb')
-rw-r--r-- | lib/sisu/v4/dal.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/sisu/v4/dal.rb b/lib/sisu/v4/dal.rb index b29bfd49..47d64ae7 100644 --- a/lib/sisu/v4/dal.rb +++ b/lib/sisu/v4/dal.rb @@ -95,12 +95,16 @@ module SiSU_DAL @@fns=nil def initialize(opt,fnx=nil) @opt,@fnx=opt,fnx - @@fns||@opt.fns - @make_fns=if @fnx and @fnx =~/\.ss[tmi]$/ - SiSU_Env::InfoFile.new(@fnx) + @@fns ||=opt.fns + fn_use=if fnx \ + and fnx =~/\.ss[tmi]$/ + fnx + elsif opt.fns =~/\.ssm$/ + opt.fns + '.sst' else - SiSU_Env::InfoFile.new(@opt.fns) + opt.fns end + @make_fns=SiSU_Env::InfoFile.new(fn_use) @fnm=@make_fns.marshal.dal_metadata @fnc=@make_fns.marshal.dal_content @idx_sst=@make_fns.marshal.dal_idx_sst_rel_html_seg @@ -269,7 +273,7 @@ module SiSU_DAL tell=(@opt.cmd=~/[vVM]/) \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}") - tell.grey_title_hi + tell.blue_title_hi end fn=(@fnx && @fnx =~/\.ss[tmi]$/) \ ? @fnx |