diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v5/se_envcall.rb | 13 | ||||
| -rw-r--r-- | lib/sisu/v6/se_envcall.rb | 13 |
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 |