From c25fc2751886278a4e7f30f127e80449160a47f1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 25 Jun 2013 00:07:44 -0400
Subject: v4: general code cleaning, sync with v5

---
 lib/sisu/v4/param.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'lib/sisu/v4/param.rb')

diff --git a/lib/sisu/v4/param.rb b/lib/sisu/v4/param.rb
index cc9f7018..fb2061a7 100644
--- a/lib/sisu/v4/param.rb
+++ b/lib/sisu/v4/param.rb
@@ -116,7 +116,6 @@ module SiSU_Param
         else
           param_msg='Parameters extracted'
           fns_array=@env.read_source_file(@opt.fns)
-          md=SiSU_Param::Parameters::Instructions.new(fns_array,@opt)
           @md=SiSU_Param::Parameters::Instructions.new(fns_array,@opt).extract
           @md
         end
@@ -947,7 +946,6 @@ module SiSU_Param
         @fnstex=@fns.gsub(/_/,'\_\-').gsub(/\./,'.\-')
         @flag_endnotes,@flag_auto_endnotes,@flag_separate_endnotes=false,false,false
         @flag_separate_endnotes_make=true
-        regx_date=/^\d{4}(?:-(?:[0][0-9]|1[0-2])(-(?:[0-2][0-9]|3[01]))?)?$/
         ver=SiSU_Env::InfoVersion.instance
         @sisu_version=ver.get_version
         @ruby_version=ver.rbversion
@@ -980,11 +978,11 @@ module SiSU_Param
             when /^@publisher:\s+(.+)/m                                        #% * header metadata - publisher
               @publisher=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).current_publisher
               @current_publisher=@publisher
-            when /^@rights:(.+)/m;                                             #% * header metadata - rights
+            when /^@rights:(.+)/m                                              #% * header metadata - rights
               @rights=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).rights
-            when /^@classify:(.+)/m; classify=$1                               #% * header metadata - classify
+            when /^@classify:(.+)/m                                            #% * header metadata - classify
               @classify=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).classify
-            when /^@identifier:(.+)/m; identify=$1                               #% * header metadata - identifier
+            when /^@identifier:(.+)/m                                          #% * header metadata - identifier
               @identifier=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).identifier
             when /^@original:(.+)/m                                            #% * header metadata - original (document)
               @original=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).original
@@ -1218,9 +1216,9 @@ module SiSU_Param
            u.each do |l|
              v << l.scan(/[^:]+/m)
            end
-           v.each do |m|
-             m[-1]=m[-1].scan(/[^|]+/m) if m[-1] =~/[|]/m
-             @topic_register_array << m
+           v.each do |s|
+             s[-1]=s[-1].scan(/[^|]+/m) if s[-1] =~/[|]/m
+             @topic_register_array << s
            end
            @topic_register_array
         end
-- 
cgit v1.2.3