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

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

diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb
index dbaf83cf..c02b8f5c 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
@@ -51,7 +51,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/concordance.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_concordance.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -118,7 +118,7 @@ module SiSU_Concordance
           SiSU_Concordance::Source::Words.new(@particulars).songsheet
         end
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -236,18 +236,19 @@ WOK
           @alphlst=SiSU_i18n::Alphabet.new(@md.opt.lng).hash_strings
           @rgx_scanlist=%r{#{Mx[:fa_italics_o]}[#{@alphlst[:l]}#{@alphlst[:u]}0-9"\s]{2,12}#{Mx[:fa_italics_c]}|#{Mx[:fa_bold_o]}[#{@alphlst[:l]}#{@alphlst[:u]}0-9"\s]{2,12}#{Mx[:fa_bold_c]}|(?:https?|file)://\S+|<\S+?>|[#{@alphlst[:l]}#{@alphlst[:u]}]+|\w+}mi
         rescue
-          SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
+          SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
             __LINE__.to_s + ':' + __FILE__
           end
         end
       end
       def songsheet
         begin
-          FileUtils::mkdir_p(@file.output_path.html_concordance.dir) unless FileTest.directory?(@file.output_path.html_concordance.dir)
+          FileUtils::mkdir_p(@file.output_path.html_concordance.dir) \
+            unless FileTest.directory?(@file.output_path.html_concordance.dir)
           @file_concordance=File.open(@file.place_file.html_concordance.dir,'w')
           map_para
         rescue
-          SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
+          SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
             __LINE__.to_s + ':' + __FILE__
           end
         ensure
-- 
cgit v1.2.3