From 71e8f191aac721011fed9cdd453642785fa0e7d6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 28 Mar 2013 21:43:59 -0400
Subject: v4: dbi, import composite files (.ssm) correctly

---
 lib/sisu/v4/dal.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v4/dal.rb')

diff --git a/lib/sisu/v4/dal.rb b/lib/sisu/v4/dal.rb
index f64586ff..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
-- 
cgit v1.2.3