Merge tag 'sisu_4.1.7' into debian/sid

SiSU 4.1.7

6 files changed, 50 insertions, 32 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index b93aa05f..11af12e9 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.1.7.orig.tar.xz (2013-06-25:25/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.7
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.7.orig.tar.xz
+  sisu_4.1.7.orig.tar.xz
+  sisu_4.1.7-1.dsc
+
+* "general code cleaning" fix
+
 %% 4.1.6.orig.tar.xz (2013-06-25:25/2)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.6
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.6-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 6c88b44e..eafa4447 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.7.orig.tar.xz (2013-06-25:25/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.7
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.7.orig.tar.xz
+  sisu_5.0.7.orig.tar.xz
+  sisu_5.0.7-1.dsc
+
+* "general code cleaning" fix
+
 %% 5.0.6.orig.tar.xz (2013-06-25:25/2)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.6
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.6-1
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index d6b1e670..c2c1b122 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.1.6
-:date_stamp: 2013w25/1
+:version: 4.1.7
+:date_stamp: 2013w25/2
 :date: "2013-06-25"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 82f4839c..9dacb8c5 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.6
-:date_stamp: 2013w25/1
+:version: 5.0.7
+:date_stamp: 2013w25/2
 :date: "2013-06-25"
 :project: SiSU
diff --git a/lib/sisu/v4/dal_expand_insertions.rb b/lib/sisu/v4/dal_expand_insertions.rb
index b8972489..9a242b28 100644
--- a/lib/sisu/v4/dal_expand_insertions.rb
+++ b/lib/sisu/v4/dal_expand_insertions.rb
@@ -154,7 +154,7 @@ module SiSU_DAL_Insertions
         "#{@base_path}/src/#{@src}"
       end
       def sisupod
-        "#{@base_path}/pod/#{@src}.zip"
+        "#{@base_path}/src/#{@src}.zip"
       end
       self
     end
@@ -204,7 +204,7 @@ module SiSU_DAL_Insertions
         "#{@base_path}/src/#{@src}"
       end
       def sisupod
-        "#{@base_path}/pod/#{@src}.zip"
+        "#{@base_path}/src/#{@src}.zip"
       end
       self
     end
@@ -274,6 +274,7 @@ module SiSU_DAL_Insertions
         and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/
           manifest=nil
           @u=SiSU_Env::InfoEnv.new.url
+          m_cmd=''
           if defined? @u.remote
             if /(?<m_pre>.+?)\{(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}(?<m_source>(?<m_linked_doc>\S+?)\.ss[tm]\b)(?<m_note>.*)/m =~ para
               m_pre=m_pre.strip
@@ -289,10 +290,9 @@ module SiSU_DAL_Insertions
             if /\{(?:~\^\s+)?(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}\.\.\/(?<m_linked_doc>\S+?)\/(?<m_note>\s+#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]})?/ =~ para
             end
           end
-          lnk={}
-          case @md.opt.dir_structure_by
+          lnk=case @md.opt.dir_structure_by
           when :language
-            lnk={
+            {
               manifest:         by_language(m_linked_doc,m_linked_doc_lang).manifest,
               html_toc:         by_language(m_linked_doc,m_linked_doc_lang).html_toc,
               html_doc:         by_language(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -306,11 +306,11 @@ module SiSU_DAL_Insertions
               txt:              by_language(m_linked_doc,m_linked_doc_lang).txt,
               html_concordance: by_language(m_linked_doc,m_linked_doc_lang).html_concordance,
               digest:           by_language(m_linked_doc,m_linked_doc_lang).digest,
-              sisupod:          by_language(m_linked_doc,m_linked_doc_lang,source).sisupod,
-              source:           by_language(m_linked_doc,m_linked_doc_lang,source).source,
+              sisupod:          by_language(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+              source:           by_language(m_linked_doc,m_linked_doc_lang,m_source).source,
             }
           when :filetype
-            lnk={
+            {
               manifest:         by_filetype(m_linked_doc,m_linked_doc_lang).manifest,
               html_toc:         by_filetype(m_linked_doc,m_linked_doc_lang).html_toc,
               html_doc:         by_filetype(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -324,11 +324,11 @@ module SiSU_DAL_Insertions
               txt:              by_filetype(m_linked_doc,m_linked_doc_lang).txt,
               html_concordance: by_filetype(m_linked_doc,m_linked_doc_lang).html_concordance,
               digest:           by_filetype(m_linked_doc,m_linked_doc_lang).digest,
-              sisupod:          by_filetype(m_linked_doc,m_linked_doc_lang,source).sisupod,
-              source:           by_filetype(m_linked_doc,m_linked_doc_lang,source).source,
+              sisupod:          by_filetype(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+              source:           by_filetype(m_linked_doc,m_linked_doc_lang,m_source).source,
             }
           else
-            lnk={
+            {
               manifest:         by_filename(m_linked_doc,m_linked_doc_lang).manifest,
               html_toc:         by_filename(m_linked_doc,m_linked_doc_lang).html_toc,
               html_doc:         by_filename(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -342,13 +342,13 @@ module SiSU_DAL_Insertions
               txt:              by_filename(m_linked_doc,m_linked_doc_lang).txt,
               html_concordance: by_filename(m_linked_doc,m_linked_doc_lang).html_concordance,
               digest:           by_filename(m_linked_doc,m_linked_doc_lang).digest,
-              sisupod:          by_filename(m_linked_doc,m_linked_doc_lang,source).sisupod,
-              source:           by_filename(m_linked_doc,m_linked_doc_lang,source).source,
+              sisupod:          by_filename(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+              source:           by_filename(m_linked_doc,m_linked_doc_lang,m_source).source,
             }
           end
           linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n"
           tuned_file_tmp << linked_title
-          output_filetypes=output_filetypes_in_cmd(cmd,lnk)
+          output_filetypes=output_filetypes_in_cmd(m_cmd,lnk)
           output_filetypes[:gen].each do |o_f|
             describe = o_f
             if describe
diff --git a/lib/sisu/v5/dal_expand_insertions.rb b/lib/sisu/v5/dal_expand_insertions.rb
index b29bca6b..77e4934c 100644
--- a/lib/sisu/v5/dal_expand_insertions.rb
+++ b/lib/sisu/v5/dal_expand_insertions.rb
@@ -154,7 +154,7 @@ module SiSU_DAL_Insertions
         "#{@base_path}/src/#{@src}"
       end
       def sisupod
-        "#{@base_path}/pod/#{@src}.zip"
+        "#{@base_path}/src/#{@src}.zip"
       end
       self
     end
@@ -204,7 +204,7 @@ module SiSU_DAL_Insertions
         "#{@base_path}/src/#{@src}"
       end
       def sisupod
-        "#{@base_path}/pod/#{@src}.zip"
+        "#{@base_path}/src/#{@src}.zip"
       end
       self
     end
@@ -274,6 +274,7 @@ module SiSU_DAL_Insertions
         and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/
           manifest=nil
           @u=SiSU_Env::InfoEnv.new.url
+          m_cmd=''
           if defined? @u.remote
             if /(?<m_pre>.+?)\{(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}(?<m_source>(?<m_linked_doc>\S+?)\.ss[tm]\b)(?<m_note>.*)/m =~ para
               m_pre=m_pre.strip
@@ -289,10 +290,9 @@ module SiSU_DAL_Insertions
             if /\{(?:~\^\s+)?(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}\.\.\/(?<m_linked_doc>\S+?)\/(?<m_note>\s+#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]})?/ =~ para
             end
           end
-          lnk={}
-          case @md.opt.dir_structure_by
+          lnk=case @md.opt.dir_structure_by
           when :language
-            lnk={
+            {
               manifest:         by_language(m_linked_doc,m_linked_doc_lang).manifest,
               html_toc:         by_language(m_linked_doc,m_linked_doc_lang).html_toc,
               html_doc:         by_language(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -306,11 +306,11 @@ module SiSU_DAL_Insertions
               txt:              by_language(m_linked_doc,m_linked_doc_lang).txt,
               html_concordance: by_language(m_linked_doc,m_linked_doc_lang).html_concordance,
               digest:           by_language(m_linked_doc,m_linked_doc_lang).digest,
-              sisupod:          by_language(m_linked_doc,m_linked_doc_lang,source).sisupod,
-              source:           by_language(m_linked_doc,m_linked_doc_lang,source).source,
+              sisupod:          by_language(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+              source:           by_language(m_linked_doc,m_linked_doc_lang,m_source).source,
             }
           when :filetype
-            lnk={
+            {
               manifest:         by_filetype(m_linked_doc,m_linked_doc_lang).manifest,
               html_toc:         by_filetype(m_linked_doc,m_linked_doc_lang).html_toc,
               html_doc:         by_filetype(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -324,11 +324,11 @@ module SiSU_DAL_Insertions
               txt:              by_filetype(m_linked_doc,m_linked_doc_lang).txt,
               html_concordance: by_filetype(m_linked_doc,m_linked_doc_lang).html_concordance,
               digest:           by_filetype(m_linked_doc,m_linked_doc_lang).digest,
-              sisupod:          by_filetype(m_linked_doc,m_linked_doc_lang,source).sisupod,
-              source:           by_filetype(m_linked_doc,m_linked_doc_lang,source).source,
+              sisupod:          by_filetype(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+              source:           by_filetype(m_linked_doc,m_linked_doc_lang,m_source).source,
             }
           else
-            lnk={
+            {
               manifest:         by_filename(m_linked_doc,m_linked_doc_lang).manifest,
               html_toc:         by_filename(m_linked_doc,m_linked_doc_lang).html_toc,
               html_doc:         by_filename(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -342,13 +342,13 @@ module SiSU_DAL_Insertions
               txt:              by_filename(m_linked_doc,m_linked_doc_lang).txt,
               html_concordance: by_filename(m_linked_doc,m_linked_doc_lang).html_concordance,
               digest:           by_filename(m_linked_doc,m_linked_doc_lang).digest,
-              sisupod:          by_filename(m_linked_doc,m_linked_doc_lang,source).sisupod,
-              source:           by_filename(m_linked_doc,m_linked_doc_lang,source).source,
+              sisupod:          by_filename(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+              source:           by_filename(m_linked_doc,m_linked_doc_lang,m_source).source,
             }
           end
           linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n"
           tuned_file_tmp << linked_title
-          output_filetypes=output_filetypes_in_cmd(cmd,lnk)
+          output_filetypes=output_filetypes_in_cmd(m_cmd,lnk)
           output_filetypes[:gen].each do |o_f|
             describe = o_f
             if describe