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/xml_odf_odt.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index 55c8d7ed..1fd32244 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -117,7 +117,7 @@ module SiSU_XML_ODF_ODT
         end
         SiSU_XML_ODF_ODT::Source::Scroll.new(@particulars).songsheet
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -150,7 +150,7 @@ module SiSU_XML_ODF_ODT
           unless (@md.opt.act[:verbose_plus][:set]==:on \
           || @md.opt.act[:maintenance][:set]==:on)
             if @env.processing_path.odt =~/od[ft]/
-              #p "rm -r #{@env.processing_path.odt}" if @md.opt.cmd =~/v/
+              #p "rm -r #{@env.processing_path.odt}" if @md.opt.selections.str =~/v/
               FileUtils::rm_r(@env.processing_path.odf_pth)
               #system("rm -r #{@env.processing_path.odt}")
             end
@@ -636,7 +636,7 @@ module SiSU_XML_ODF_ODT
         odf_book_idx
         odf_metadata
         data.each do |dob|
-          #p dob.obj if dob.obj =~safe_characters and @md.opt.cmd =~/V/ #KEEP
+          #p dob.obj if dob.obj =~safe_characters and @md.opt.selections.str =~/V/ #KEEP
           dob.obj='' if dob.obj =~/#{Mx[:lv_o]}\d+:.*?#{Mx[:lv_c]}.+?#{Mx[:pa_non_object_dummy_heading]}/ #fix Mx[:lv_o]
           para_array=[]
           dob.obj=dob.obj.gsub(/</,'&lt;').gsub(/>/,'&gt;')
-- 
cgit v1.2.3