From 06520be4633f7ee3463c92615be3e11f0f21fa08 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 21 Apr 2012 01:47:35 -0400
Subject: v3: db bugfix in maintenance mode (variable name reused)

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

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

diff --git a/lib/sisu/v3/db_import.rb b/lib/sisu/v3/db_import.rb
index 3bb6e210..e4f90e1d 100644
--- a/lib/sisu/v3/db_import.rb
+++ b/lib/sisu/v3/db_import.rb
@@ -69,8 +69,8 @@ module SiSU_DbImport
     @@dl=nil
     @@hname=nil
     attr_accessor :tp
-    def initialize(opt,conn,file,sql_type='pg')
-      @opt,@conn,@file,@sql_type=opt,conn,file,sql_type
+    def initialize(opt,conn,file_maint,sql_type='pg')
+      @opt,@conn,@file_maint,@sql_type=opt,conn,file_maint,sql_type
       @cX=SiSU_Screen::Ansi.new(@opt.cmd).cX
       @env=SiSU_Env::InfoEnv.new(@opt.fns)
       @dal="#{@env.processing_path.dal}"
@@ -239,7 +239,7 @@ module SiSU_DbImport
       end
       ################ CLEAR ##############
       SiSU_DbDBI::Test.new(self,@opt).verify                          #% import title names, filenames (tuple)
-      t=SiSU_DbTuple::LoadMetadata.new(@conn,@@id_t,@md,@file)
+      t=SiSU_DbTuple::LoadMetadata.new(@conn,@@id_t,@md,@file_maint)
       tuple=t.tuple
       tuple
     end
@@ -283,7 +283,7 @@ module SiSU_DbImport
               end
               if @en_pls[0]; @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last
               end
-              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file)
+              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               case @col[:lev]
               when /1/; @col[:lv1]+=1
@@ -314,7 +314,7 @@ module SiSU_DbImport
               @en_a,@en_z=@en[0].first,@en[0].last if @en[0]
               @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
-              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file)
+              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               @col[:lev]=@col[:plaintext]=@col[:body]=''
             elsif data.is==:heading \
@@ -344,7 +344,7 @@ module SiSU_DbImport
               @en_a,@en_z=@en[0].first,@en[0].last if @en[0]
               @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
-              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file)
+              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               @col[:lev]=@col[:plaintext]=@col[:body]=''
             elsif data.is==:heading \
@@ -372,7 +372,7 @@ module SiSU_DbImport
               @en_a,@en_z=@en[0].first,@en[0].last if @en[0]
               @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
-              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file)
+              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               @col[:lev]=@col[:plaintext]=@col[:body]=''
             elsif data.of==:structure \
@@ -423,7 +423,7 @@ module SiSU_DbImport
               @col[:plaintext]=@col[:body].dup
               @col[:plaintext]=strip_markup(@col[:plaintext])
               @col[:plaintext]=clean_searchable_text(@col[:plaintext])
-              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file)
+              t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               @en,@en_ast,@en_pls=[],[],[]
               @col[:en_a]=@col[:en_z]=nil
@@ -461,7 +461,7 @@ module SiSU_DbImport
                       id_t:    @@id_t,
                       hash:    digest_clean
                     }
-                    t=SiSU_DbTuple::LoadEndnotes.new(@conn,en,@opt,@file)
+                    t=SiSU_DbTuple::LoadEndnotes.new(@conn,en,@opt,@file_maint)
                     @tuple_array << t.tuple
                   end
                 end
@@ -500,7 +500,7 @@ module SiSU_DbImport
                       id_t:    @@id_t,
                       hash:    digest_clean
                     }
-                    t=SiSU_DbTuple::LoadEndnotes.new(@conn,en,@opt,@file)
+                    t=SiSU_DbTuple::LoadEndnotes.new(@conn,en,@opt,@file_maint)
                     @tuple_array << t.tuple
                   end
                 end
@@ -539,7 +539,7 @@ module SiSU_DbImport
                       id_t:    @@id_t,
                       hash:    digest_clean
                     }
-                    t=SiSU_DbTuple::LoadEndnotes.new(@conn,en,@opt,@file)
+                    t=SiSU_DbTuple::LoadEndnotes.new(@conn,en,@opt,@file_maint)
                     @tuple_array << t.tuple
                   end
                 end
@@ -678,7 +678,7 @@ module SiSU_DbImport
         if FileTest.file?("#{@md.file.output_path.sisupod.dir}/#{@md.file.base_filename.sisupod}")==true
           f[:sisupod],u[:sisupod]='sisupod,', "'#{@md.file.output_path.sisupod.url}/#{@md.file.base_filename.sisupod}',"
         end
-        t=SiSU_DbTuple::LoadUrls.new(@conn,f,u,@@id_t,@opt,@file)
+        t=SiSU_DbTuple::LoadUrls.new(@conn,f,u,@@id_t,@opt,@file_maint)
         tuple=t.tuple
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-- 
cgit v1.2.3