v5 v6: se, env, lingual: mono / multi, rc settings
authorRalph Amissah <ralph@amissah.com>
Sat, 13 Sep 2014 01:16:01 +0000 (21:16 -0400)
committerRalph Amissah <ralph@amissah.com>
Sat, 13 Sep 2014 01:16:01 +0000 (21:16 -0400)
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/se_envcall.rb
lib/sisu/v6/se_envcall.rb

index 185bc6ed89b19d8639fe3defb8c74eebfa58e18c..f20ac50601443daebaa6180df381ba83860f3fa5 100644 (file)
@@ -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)
index c5d5c646d5817b691b07cbf44b32591023a853be..8cc80e2de608ce8fb5e9d1efa822b0f05b2172ce 100644 (file)
@@ -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)
index defc51e43ebf84d9754ef43325f3dbd222a85afc..cd0bda7d7bcfb75ace5afdd6655f0c221634e750 100644 (file)
@@ -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
index 3727baf68286b762937f391be66ee33afbea202d..bb9187861bc857e17472c4683e8409aa16bb4d22 100644 (file)
@@ -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