From 2cd635d524721efaf5cf170b7bde79c1e910b096 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 3 Jun 2012 14:20:18 -0400
Subject: v3: error & warning messages touched, revisit

---
 lib/sisu/v3/param.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index f1c4aa3a..78e42bd4 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -170,10 +170,10 @@ module SiSU_Param
           s
         elsif s.class==NilClass; nil
         elsif s.class !=String
-          puts "#{n} is #{s.class}: programming error, String expected #{__FILE__}:#{__LINE__}"
+          STDERR.puts "#{n} is #{s.class}: programming error, String expected #{__FILE__}:#{__LINE__}"
           s
         else
-          SiSU_Screen::Ansi.new('v',"#{n} length #{s.length} exceeds set db field length #{l}, metadata dropped",@opt.fns).warn unless @opt.cmd =~/q/
+          SiSU_Screen::Ansi.new('v',"*WARN* #{n} length #{s.length} exceeds set db field length #{l}, metadata dropped",@opt.fns).warn unless @opt.cmd =~/q/
           nil
         end
       end
@@ -197,11 +197,11 @@ module SiSU_Param
             end
             b.delete_at(0)
             b.each do |d|
-             k,c=nil
-             k,c=/^(\S+)\s+(.*)/.match(d)[1,2] if d
-             @name_a_h[i][:hon]=c.strip if k=='hon'
-             @name_a_h[i][:affiliation]=c.strip if k=='affiliation'
-             @name_a_h[i][:nationality]=c.strip if k=='nationality'
+              k,c=nil
+              k,c=/^(\S+)\s+(.*)/.match(d)[1,2] if d
+              @name_a_h[i][:hon]=c.strip if k=='hon'
+              @name_a_h[i][:affiliation]=c.strip if k=='affiliation'
+              @name_a_h[i][:nationality]=c.strip if k=='nationality'
             end
           end
           l=@name_a_h.length
@@ -1179,7 +1179,7 @@ module SiSU_Param
             if ok
               tell.txt_green if @opt.cmd =~/[vVM]/
             else
-              SiSU_Screen::Ansi.new(@opt.cmd,"Warning: markup version determined (#{@markup_version.determined}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})").warn unless @opt.cmd =~/q/
+              SiSU_Screen::Ansi.new(@opt.cmd,"WARNING: markup version determined (#{@markup_version.determined}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})").warn unless @opt.cmd =~/q/
             end
           else
             SiSU_Screen::Ansi.new(@opt.cmd,'No SiSU markup version provided').warn if @opt.cmd =~/[VM]/
@@ -1518,13 +1518,13 @@ module SiSU_Param
         if @en[:note] > 0 \
         and @en[:sum] > 0
           if @en[:sum] > 0
-          else SiSU_Screen::Ansi.new(@opt.cmd,'both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn if @opt.cmd !~/q/
+          else SiSU_Screen::Ansi.new(@opt.cmd,'*WARN* both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn if @opt.cmd !~/q/
           end
         end
         if @en[:mark] != @en[:note] \
         and @en[:note] > 0
           @en[:mismatch]=@en[:note] - @en[:mark]
-          SiSU_Screen::Ansi.new(@opt.cmd,'endnote number mismatch',"endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})").warn if @opt.cmd !~/q/
+          SiSU_Screen::Ansi.new(@opt.cmd,'*WARN* endnote number mismatch',"endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})").warn if @opt.cmd !~/q/
           footnote_conversion_errors=File.new("#{Dir.pwd}/footnote_conversion_errors.txt",'a')
           footnote_conversion_errors << "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})\n"
         end
@@ -1535,7 +1535,7 @@ module SiSU_Param
           and  @opt.inspect =~/P/
             #@title=Md.new('Text Insert',@opt,@env).title
           else
-            SiSU_Screen::Ansi.new(@opt.cmd,'WARNING Document Title missing','please provide @title:').warn unless @opt.cmd =~/q/
+            SiSU_Screen::Ansi.new(@opt.cmd,'WARNING: Document Title missing','please provide @title:').warn unless @opt.cmd =~/q/
           end
         end
         if @author !~/[\S]/
@@ -1543,7 +1543,7 @@ module SiSU_Param
           and  @opt.inspect =~/P/
             #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
           else
-            SiSU_Screen::Ansi.new(@opt.cmd,'Warning Document Author missing','please provide @creator: :author:').warn unless @opt.cmd =~/q/
+            SiSU_Screen::Ansi.new(@opt.cmd,'WARNING: Document Author missing','please provide @creator: :author:').warn unless @opt.cmd =~/q/
           end
         end
         @struct={}
-- 
cgit v1.2.3