From 08c69d074001507d64cd5960c8679ec91a5a8353 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 23 Aug 2008 12:01:59 -0400
Subject: pass Hash to Format classes; some match tuning in dal

---
 lib/sisu/v0/db_import.rb | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'lib/sisu/v0/db_import.rb')

diff --git a/lib/sisu/v0/db_import.rb b/lib/sisu/v0/db_import.rb
index addd1ae1..52bb3ad2 100644
--- a/lib/sisu/v0/db_import.rb
+++ b/lib/sisu/v0/db_import.rb
@@ -402,7 +402,8 @@ module SiSU_DB_import
                 end
                 txt=endnotes(txt).clean_text
               end
-              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).lev4_minus
+              txt_obj={:txt =>txt,:col =>@col}
+              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).lev4_minus
               special_character_escape(@col[:body])
               @col[:plaintext]=@col[:body].dup
               strip_markup(@col[:plaintext])
@@ -443,7 +444,8 @@ module SiSU_DB_import
                 end
                 txt=endnotes(txt).clean_text(@base_url)
               end
-              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).lev4_plus
+              txt_obj={:txt =>txt,:col =>@col}
+              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).lev4_plus
               special_character_escape(@col[:body])
               @col[:plaintext]=@col[:body].dup
               strip_markup(@col[:plaintext])
@@ -482,7 +484,8 @@ module SiSU_DB_import
                 end
                 txt=endnotes(txt).clean_text(@base_url)
               end
-              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).lev4_plus
+              txt_obj={:txt =>txt,:col =>@col}
+              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).lev4_plus
               special_character_escape(@col[:body])
               @col[:plaintext]=@col[:body].dup
               strip_markup(@col[:plaintext])
@@ -521,7 +524,8 @@ module SiSU_DB_import
                 end
                 txt=endnotes(txt).clean_text(@base_url)
               end
-              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).lev4_plus
+              txt_obj={:txt =>txt,:col =>@col}
+              @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).lev4_plus
               special_character_escape(@col[:body])
               @col[:plaintext]=@col[:body].dup
               strip_markup(@col[:plaintext])
@@ -570,11 +574,14 @@ module SiSU_DB_import
               if @en_pls[0]; @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last
               end
               @col[:body]=if txt=~/#{Mx[:gr_o]}T[h]?#{Mx[:tc_p]}.+?#{Mx[:tc_p]}~\d+;\w\d+;\w\d+#{Mx[:gr_c]}/ #watch
-                SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).html_table
+                txt_obj={:txt =>txt,:col =>@col}
+                SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).html_table
               elsif txt=~/^#{Mx[:pa_o]}:i([1-9])#{Mx[:pa_c]}/
-                SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).indent($1)
+                txt_obj={:txt =>txt,:col =>@col}
+                SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).indent($1)
               else
-                SiSU_Format_Shared::CSS_Format.new(@md,txt,@col).norm
+                txt_obj={:txt =>txt,:col =>@col}
+                SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).norm
               end
               special_character_escape(@col[:body])
               @col[:plaintext]=@col[:body].dup
@@ -593,7 +600,8 @@ module SiSU_DB_import
                     nr,txt,digest_clean=$1,$2,$3
                   end
                   @id_n+=1
-                  body=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col,nr).endnote
+                  txt_obj={:txt =>txt,:col =>@col,:endnote_nr =>nr}
+                  body=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).endnote
                   special_character_escape(body)
                   special_character_escape(txt)
                   strip_markup(txt)
@@ -633,7 +641,8 @@ module SiSU_DB_import
                     nr,txt,digest_clean=$1,$2,$3
                   end
                   @id_n+=1
-                  body=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col,nr).endnote
+                  txt_obj={:txt =>txt,:col =>@col,:endnote_nr =>nr}
+                  body=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).endnote
                   special_character_escape(body)
                   special_character_escape(txt)
                   strip_markup(txt)
@@ -674,7 +683,8 @@ module SiSU_DB_import
                     nr,txt,digest_clean=$1,$2,$3
                   end
                   @id_n+=1
-                  body=SiSU_Format_Shared::CSS_Format.new(@md,txt,@col,nr).endnote
+                  txt_obj={:txt =>txt,:col =>@col,:endnote_nr =>nr}
+                  body=SiSU_Format_Shared::CSS_Format.new(@md,txt_obj).endnote
                   special_character_escape(body)
                   special_character_escape(txt)
                   strip_markup(txt)
-- 
cgit v1.2.3