From 29fcf4ab543eb68ccd1ac4e29decbd7855696bd0 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 15 May 2011 11:50:04 -0400
Subject: v3: sysenv, output directory structure check, fix (start testing
 alternatives)

---
 data/doc/sisu/CHANGELOG_v3 |  4 ++++
 lib/sisu/v3/sysenv.rb      | 21 +++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index ca62cc5c..d0c1354b 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -28,6 +28,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.9.orig.tar.gz
   * copyright file, softlink, make more visible in tarball and update
     * sisu-mode.el assigned to FSF (GNU EMACS)
 
+  * sysenv
+    * output directory structure check, fix & start testing alternatives
+      sisurc.yml output_by: (language|filetype|filename)
+
 %% 3.0.8.orig.tar.gz (2011-05-05:18/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index a1c6228b..c22f878c 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -405,11 +405,10 @@ module SiSU_Env
         x=if defined? @rc['output_dir_structure_by'] \
         and @rc['output_dir_structure_by'] =~/language/
           true
-        else defined? @rc['output_structure']['by_language']
-          (defined? @rc['output_structure']['by_language'] \
-          && @rc['output_structure']['by_language'] ==true) \
-          ? true \
-          : false
+        elsif defined? @rc['output_structure']['by_language'] \
+        and @rc['output_structure']['by_language'] ==true
+          true
+        else false
         end
       end
       def by_filetype?
@@ -418,11 +417,10 @@ module SiSU_Env
         elsif defined? @rc['output_dir_structure_by'] \
         and @rc['output_dir_structure_by'] =~/filetype/
           true
-        else
-          x=(defined? @rc['output_structure']['by_filetype'] \
-          && @rc['output_structure']['by_filetype'] ==true) \
-          ? true \
-          : false
+        elsif defined? @rc['output_structure']['by_filetype'] \
+        and @rc['output_structure']['by_filetype'] ==true
+          true
+        else false
         end
       end
       def by_filename?
@@ -436,8 +434,7 @@ module SiSU_Env
         elsif defined? @rc['output_structure']['by_filename'] \
         and @rc['output_structure']['by_filename'] ==true
           true
-        else
-          true
+        else true
         end
       end
       def multilingual?
-- 
cgit v1.2.3