From f330953381476d47deaecfdd209fed0264ace190 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 19 Apr 2011 21:29:58 -0400
Subject: v3: odf:odt processing in separate subdirectories

* processing in separate subdirectories that can be kept for maintenance
* odt.zip (bin) directory renamed odt from odf
* sysenv, odf:odt paths adjusted for changes in maintenance & odt.zip
---
 lib/sisu/v3/sysenv.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib/sisu/v3/sysenv.rb')

diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 7cc2a327..a573a6c0 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -1654,8 +1654,15 @@ WOK
         end
         pth
       end
+      def odf_pth
+        pth="#{processing}/odf/#{@fns}"
+        pth
+      end
       def odf
-        pth="#{processing}/odf"
+        odt
+      end
+      def odt
+        pth=odf_pth + '/odt'
         mkdir_p(pth) unless FileTest.directory?(pth)
         pth
       end
@@ -2196,8 +2203,9 @@ WOK
       : (defaults[:papersize].downcase)
     end
     def odf_structure
-      rm_rf("#{processing_path.processing}/odf")
-      system("unzip -q #{path.share}/#{SiSU_version_dir}/odf/odt.zip -d      #{processing_path.processing}")
+      rm_rf(processing_path.processing_path.odf_pth)
+      mkdir_p(processing_path.processing_path.odf_pth)
+      system("unzip -q #{path.share}/#{SiSU_version_dir}/odf/odt.zip -d      #{processing_path.odf_pth}")
     end
     def sisupod_gen(fns_pod)
       pwd=Dir.pwd
-- 
cgit v1.2.3