From 809034240a1be22cc00cb3b4c1df1dd2facdc8f8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Aug 2014 00:32:27 -0400
Subject: v5: merged v6 libraries

* commandline, --act0 to --act9, rc-config with flag:act[0-9]
  * configurable command line options increased to 0 - 9 (instead of 0 - 5)
  * use --act0 to --act9 (previous flags -1 to -5; -0 to -9 now available)
  * default --act0
  * rc config with flag:act0 to flag:act9 (previously roman numerals)
  * legacy roman numeral configuration works (for now)
* use opt.act, code internals (simplify, cleaner; remove opt.cmd
    & opt.mod)
* hub, further changes related to use of opt.act; hub file split
---
 lib/sisu/v5/conf.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/v5/conf.rb
index 820d0941..b126d320 100644
--- a/lib/sisu/v5/conf.rb
+++ b/lib/sisu/v5/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