aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-09-12 21:16:01 -0400
committerRalph Amissah <ralph@amissah.com>2014-09-12 21:16:01 -0400
commitb1e7b97d5640467a377770d0870cd6fa18ca3a3f (patch)
tree7c4bd1f4bb95b833207eb31fc922ab22523ad45c /lib
parentv5 v6: hub, /tmp processing directory checks (diff)
v5 v6: se, env, lingual: mono / multi, rc settings
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v5/se_envcall.rb13
-rw-r--r--lib/sisu/v6/se_envcall.rb13
2 files changed, 16 insertions, 10 deletions
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