1 files changed, 27 insertions, 41 deletions
diff --git a/lib/sisu/v3dv/sysenv.rb b/lib/sisu/v3dv/sysenv.rb
index 1b1a5857..7374d88f 100644
--- a/lib/sisu/v3dv/sysenv.rb
+++ b/lib/sisu/v3dv/sysenv.rb
@@ -405,56 +405,42 @@ module SiSU_Env
       @fnn,@fnb,@fnt,@flv,@fnz=@@fnn,@@fnb,@@fnt,@@flv,@@fnz
     end
     def output_dir_structure
-      def by_language_code?
-        x=if defined? @rc['output_dir_structure_by'] \
-        and @rc['output_dir_structure_by'] =~/language/
-          true
-        elsif defined? @rc['output_structure']['by_language'] \
-        and @rc['output_structure']['by_language'] ==true
-          true
-        else false
+      def by?
+        output_structure=:filename #set default output structure
+        output_structure=if defined? @rc['output_dir_structure_by']
+          output_structure=if (@rc['output_dir_structure_by'] =~/language/) \
+          or ((defined? @rc['output_structure']['by_language']) \
+          && @rc['output_structure']['by_language'] ==true)
+            :language
+          elsif (@rc['output_dir_structure_by'] =~/filetype/) \
+          or ((defined? @rc['output_structure']['by_filetype']) \
+          && @rc['output_structure']['by_filetype'] ==true)
+            :filetype
+          elsif (@rc['output_dir_structure_by'] =~/filename/) \
+          or ((defined? @rc['output_structure']['by_filename']) \
+          && @rc['output_structure']['by_filename'] ==true)
+            :filename
+          end
         end
       end
+      def by_language_code?
+        ((by?) ==:language) \
+        ? true \
+        : false
+      end
       def by_filetype?
-        x=if by_language_code?
-          false
-        elsif defined? @rc['output_dir_structure_by'] \
-        and @rc['output_dir_structure_by'] =~/filetype/
-          true
-        elsif defined? @rc['output_structure']['by_filetype'] \
-        and @rc['output_structure']['by_filetype'] ==true
-          true
-        else false
-        end
+        ((by?) ==:filetype) \
+        ? true \
+        : false
       end
       def by_filename?
-        x=if by_language_code?
-          false
-        elsif by_filetype?
-          false
-        elsif defined? @rc['output_dir_structure_by'] \
-        and @rc['output_dir_structure_by'] =~/filename/
-          true
-        elsif defined? @rc['output_structure']['by_filename'] \
-        and @rc['output_structure']['by_filename'] ==true
-          true
-        else true
-        end
+        ((by?) ==:filename) \
+        ? true \
+        : false
       end
       def multilingual?
         by_language_code?
       end
-      def by?
-        by=if by_language_code?
-          'language'
-        elsif by_filetype?
-          'filetype'
-        elsif by_filename?
-          'filename'
-        else
-          'filename'
-        end
-      end
       self
     end
     def document_language_versions_found #REVISIT