From b1e7b97d5640467a377770d0870cd6fa18ca3a3f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 12 Sep 2014 21:16:01 -0400
Subject: v5 v6: se, env, lingual: mono / multi, rc settings

---
 data/doc/sisu/CHANGELOG_v5 |  2 ++
 data/doc/sisu/CHANGELOG_v6 |  2 ++
 lib/sisu/v5/se_envcall.rb  | 13 ++++++++-----
 lib/sisu/v6/se_envcall.rb  | 13 ++++++++-----
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 185bc6ed..f20ac506 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.6.orig.tar.xz
   sisu_5.6.6.orig.tar.xz
   sisu_5.6.6-1.dsc
 
+* se, env, lingual: mono / multi, rc settings
+
 * hub, /tmp processing directory checks
 
 %% 5.6.5.orig.tar.xz (2014-09-05:35/5)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index c5d5c646..8cc80e2d 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.7.orig.tar.xz
   sisu_6.2.7.orig.tar.xz
   sisu_6.2.7-1.dsc
 
+* se, env, lingual: mono / multi, rc settings
+
 * hub, /tmp processing directory checks
 
 %% 6.2.6.orig.tar.xz (2014-09-05:35/5)
diff --git a/lib/sisu/v5/se_envcall.rb b/lib/sisu/v5/se_envcall.rb
index defc51e4..cd0bda7d 100644
--- a/lib/sisu/v5/se_envcall.rb
+++ b/lib/sisu/v5/se_envcall.rb
@@ -111,13 +111,16 @@ module SiSU_Env_Call
     end
     def mono_multi_lingual?
       if @rc \
-      && defined? @rc['lingual']
-        if (@rc['lingual'].is_a?(String)) \
-        && (@rc['lingual'] =~/mono(?:lingual)?/)
+      && defined? @rc['output_dir_structure_by']
+        if @rc['output_dir_structure_by'] \
+        =~/dump/
           :mono
-        elsif  (@rc['lingual'].is_a?(String)) \
-        && (@rc['lingual'] =~/multi(?:lingual)?/)
+        elsif @rc['output_dir_structure_by'] \
+        =~/language|redirect/
           :multi
+        elsif @rc['output_dir_structure_by'] \
+        =~/monolingual|filetype_mono|filenaneme_mono/
+          :mono
         else :multi
         end
       else :multi
diff --git a/lib/sisu/v6/se_envcall.rb b/lib/sisu/v6/se_envcall.rb
index 3727baf6..bb918786 100644
--- a/lib/sisu/v6/se_envcall.rb
+++ b/lib/sisu/v6/se_envcall.rb
@@ -111,13 +111,16 @@ module SiSU_Env_Call
     end
     def mono_multi_lingual?
       if @rc \
-      && defined? @rc['lingual']
-        if (@rc['lingual'].is_a?(String)) \
-        && (@rc['lingual'] =~/mono(?:lingual)?/)
+      && defined? @rc['output_dir_structure_by']
+        if @rc['output_dir_structure_by'] \
+        =~/dump/
           :mono
-        elsif  (@rc['lingual'].is_a?(String)) \
-        && (@rc['lingual'] =~/multi(?:lingual)?/)
+        elsif @rc['output_dir_structure_by'] \
+        =~/language|redirect/
           :multi
+        elsif @rc['output_dir_structure_by'] \
+        =~/monolingual|filetype_mono|filenaneme_mono/
+          :mono
         else :multi
         end
       else :multi
-- 
cgit v1.2.3