From 64e5c9120ffb7a65b96eded0850f481e116f1d3f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Aug 2014 00:16:16 -0400
Subject: v6: use opt.act, code internals (simplify, cleaner; remove opt.cmd &
 opt.mod)

* v5 dp, indentation changed to retain easy comparison with v6
---
 lib/sisu/v6/conf.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/sisu/v6/conf.rb')

diff --git a/lib/sisu/v6/conf.rb b/lib/sisu/v6/conf.rb
index 2f29902f..22111002 100644
--- a/lib/sisu/v6/conf.rb
+++ b/lib/sisu/v6/conf.rb
@@ -206,10 +206,10 @@ module SiSU_Initialize
       rnc.close
       #xsd
       schema=SiSU_Env::SystemCall.new(rnc_src,xsd_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
       #rng
       schema=SiSU_Env::SystemCall.new(rnc_src,rng_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
       #rnc
       if FileTest.file?(rnc_src)
         FileUtils::cp(rnc_src,rnc_file)
@@ -228,10 +228,10 @@ module SiSU_Initialize
       rnc.close
       #xsd
       schema=SiSU_Env::SystemCall.new(rnc_src,xsd_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
       #rng
       schema=SiSU_Env::SystemCall.new(rnc_src,rng_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
       #rnc
       if FileTest.file?(rnc_src)
         FileUtils::cp(rnc_src,rnc_file)
@@ -250,10 +250,10 @@ module SiSU_Initialize
       rnc.close
       #xsd
       schema=SiSU_Env::SystemCall.new(rnc_src,xsd_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
       #rng
       schema=SiSU_Env::SystemCall.new(rnc_src,rng_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
       #rnc
       if FileTest.file?(rnc_src)
         FileUtils::cp(rnc_src,rnc_file)
@@ -268,7 +268,7 @@ module SiSU_Initialize
       rnc << @rxng.rnc_model_output_sax
       rnc.close
       schema=SiSU_Env::SystemCall.new(rnc_file,dtd_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
     end
     def trang_rnc_model_input_dom
       rnc_file=@env.processing_path.ao + '/dom.rnc'
@@ -277,7 +277,7 @@ module SiSU_Initialize
       rnc << @rxng.rnc_model_output_dom
       rnc.close
       schema=SiSU_Env::SystemCall.new(rnc_file,dtd_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
     end
     def trang_rnc_model_input_node
       rnc_file=@env.processing_path.ao + '/node.rnc'
@@ -286,7 +286,7 @@ module SiSU_Initialize
       rnc << @rxng.rnc_model_input_node
       rnc.close
       schema=SiSU_Env::SystemCall.new(rnc_file,dtd_file)
-      schema.relaxng(@opt.cmd)
+      schema.relaxng(@opt.selections.str)
     end
   end
 end
-- 
cgit v1.2.3