v5 v6: src, sisupod, bring back in line

4 files changed, 22 insertions, 14 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 4b1e3fef..1a1cd366 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -44,6 +44,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.1.orig.tar.xz
 
 * ao_numbering, auto name segment, extract "number" from heading, refine
 
+* src, sisupod, bring back in line
+
 %% 5.5.0.orig.tar.xz (2014-07-11:27/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.0-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index a3a11127..b8af7573 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -34,6 +34,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.1.orig.tar.xz
 
 * ao_numbering, auto name segment, extract "number" from heading, refine
 
+* src, sisupod, bring back in line
+
 %% 6.1.0.orig.tar.xz (2014-07-11:27/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.0-1
diff --git a/lib/sisu/v5/src_shared.rb b/lib/sisu/v5/src_shared.rb
index a4b3a974..03d902fd 100644
--- a/lib/sisu/v5/src_shared.rb
+++ b/lib/sisu/v5/src_shared.rb
@@ -245,7 +245,7 @@ module SiSU_Source
                   %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
               end
             else
-              if FileTest.file?("#{@opt.base_path}/#{f[:f]}")
+              if FileTest.file?("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}")
                 cpy= :no
                 cpy=if f[:f] =~ /^#{@opt.f_pth[:lng_is]}\// \
                 or f[:f] =~ /~#{@opt.f_pth[:lng_is]}\.sst/
@@ -256,12 +256,12 @@ module SiSU_Source
                 else :no
                 end
                 if cpy == :yes
-                  FileUtils::cp("#{@opt.base_path}/#{f[:f]}",
+                  FileUtils::cp("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
                     "#{@path_pod[:doc]}/#{f[:n]}")
                 end
               else
                 STDERR.puts \
-                  %{\t*WARN* did not find - "#{@opt.base_path}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
+                  %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
               end
             end
           end
@@ -272,9 +272,11 @@ module SiSU_Source
       SiSU_Env::InfoEnv.new.sisupod_v4(@opt)
     end
     def ssm_doc_import_list(f)
-      if @opt.fno =~/\.ssm$/
+      if @opt.fno =~/\.ss[mi]$/
         doc_import_list=[]
-        doc_import_list << f.scan(@rgx_doc_import) if f =~@rgx_doc_import
+        if f =~@rgx_doc_import
+          doc_import_list << f.scan(@rgx_doc_import)
+        end
         doc_import_list.flatten.each do |i|
           if i =~/.ssi/
             file_array=IO.readlines(i,'')
@@ -286,11 +288,11 @@ module SiSU_Source
     end
     def pod_source_build(file_array)
       @pwd=Dir.pwd
-      @rgx_doc_import_list=/^<<\s*(\S+?\.ss[ti])/
+      @rgx_doc_import=/^<<\s*(\S+?\.ss[ti])/
       doc_import_list=[]
       file_array.each do |f|                                                   #% work area
         if f !~/^%+\s/
-          if @opt.fno =~/\.ssm$/
+          if @opt.fno =~/\.ss[mi]$/
             @doc_import_list << ssm_doc_import_list(f)
             doc_import_list=@doc_import_list.flatten.uniq
           end
diff --git a/lib/sisu/v6/src_shared.rb b/lib/sisu/v6/src_shared.rb
index cee7e1c5..495cc584 100644
--- a/lib/sisu/v6/src_shared.rb
+++ b/lib/sisu/v6/src_shared.rb
@@ -245,7 +245,7 @@ module SiSU_Source
                   %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
               end
             else
-              if FileTest.file?("#{@opt.base_path}/#{f[:f]}")
+              if FileTest.file?("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}")
                 cpy= :no
                 cpy=if f[:f] =~ /^#{@opt.f_pth[:lng_is]}\// \
                 or f[:f] =~ /~#{@opt.f_pth[:lng_is]}\.sst/
@@ -256,12 +256,12 @@ module SiSU_Source
                 else :no
                 end
                 if cpy == :yes
-                  FileUtils::cp("#{@opt.base_path}/#{f[:f]}",
+                  FileUtils::cp("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
                     "#{@path_pod[:doc]}/#{f[:n]}")
                 end
               else
                 STDERR.puts \
-                  %{\t*WARN* did not find - "#{@opt.base_path}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
+                  %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
               end
             end
           end
@@ -272,9 +272,11 @@ module SiSU_Source
       SiSU_Env::InfoEnv.new.sisupod_v4(@opt)
     end
     def ssm_doc_import_list(f)
-      if @opt.fno =~/\.ssm$/
+      if @opt.fno =~/\.ss[mi]$/
         doc_import_list=[]
-        doc_import_list << f.scan(@rgx_doc_import) if f =~@rgx_doc_import
+        if f =~@rgx_doc_import
+          doc_import_list << f.scan(@rgx_doc_import)
+        end
         doc_import_list.flatten.each do |i|
           if i =~/.ssi/
             file_array=IO.readlines(i,'')
@@ -286,11 +288,11 @@ module SiSU_Source
     end
     def pod_source_build(file_array)
       @pwd=Dir.pwd
-      @rgx_doc_import_list=/^<<\s*(\S+?\.ss[ti])/
+      @rgx_doc_import=/^<<\s*(\S+?\.ss[ti])/
       doc_import_list=[]
       file_array.each do |f|                                                   #% work area
         if f !~/^%+\s/
-          if @opt.fno =~/\.ssm$/
+          if @opt.fno =~/\.ss[mi]$/
             @doc_import_list << ssm_doc_import_list(f)
             doc_import_list=@doc_import_list.flatten.uniq
           end