From 6a8a7c3cf32fa1920bfcd62c0702b14dd84e6d65 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 21 Sep 2013 00:05:24 -0400
Subject: v4: dal, objects, store book index as hash (simplify downstream
 processing)

* merge v5
* db, book index, convert hash back to string (associated downstream processing
  change)
---
 lib/sisu/v4/db_import.rb | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

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

diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb
index 240efd67..0384795a 100644
--- a/lib/sisu/v4/db_import.rb
+++ b/lib/sisu/v4/db_import.rb
@@ -209,6 +209,26 @@ module SiSU_DbImport
     end
     def pf_db_import_transaction_close
     end
+    def book_idx_hash_to_str(book_idx)
+      book_idx=book_idx ? book_idx : ''
+      book_idx_str,book_subidx_part='',''
+      if not book_idx.empty?
+        book_idx_str=''
+        book_idx.each_pair do |k0,v0|
+          book_idx_str << %{#{k0}+#{v0[:plus]}}
+          book_subidx_part=''
+          if v0[:sub].length > 0
+            v0[:sub].each do |subterms|
+               subterms.each_pair do |k1,v1|
+                 book_subidx_part << %{\n  #{k1}+#{v1[:plus]} | }
+               end
+            end
+            book_idx_str=book_idx_str + ':' + book_subidx_part
+          end
+        end
+      end
+      book_idx_str
+    end
     def db_import_metadata                                                       #% import documents - populate database
       print %{ #{@cX.grey}import documents dbi_unit #{@cX.off} } if @opt.cmd =~/vVM/
       @tp={}
@@ -285,7 +305,7 @@ module SiSU_DbImport
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
               @col[:plaintext]=clean_searchable_text(plaintext)
-              book_idx=data.idx ? data.idx : ''
+              book_idx=book_idx_hash_to_str(data.idx)
               @col[:book_idx]=clean_searchable_text(book_idx)
               if @en[0] then @en_a,@en_z=@en[0].first,@en[0].last
               end
@@ -321,7 +341,7 @@ module SiSU_DbImport
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
               @col[:plaintext]=clean_searchable_text(plaintext)
-              book_idx=data.idx ? data.idx : ''
+              book_idx=book_idx_hash_to_str(data.idx)
               @col[:book_idx]=clean_searchable_text(book_idx)
               @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]
@@ -353,7 +373,7 @@ module SiSU_DbImport
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
               @col[:plaintext]=clean_searchable_text(plaintext)
-              book_idx=data.idx ? data.idx : ''
+              book_idx=book_idx_hash_to_str(data.idx)
               @col[:book_idx]=clean_searchable_text(book_idx)
               @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]
@@ -383,7 +403,7 @@ module SiSU_DbImport
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
               @col[:plaintext]=clean_searchable_text(plaintext)
-              book_idx=data.idx ? data.idx : ''
+              book_idx=book_idx_hash_to_str(data.idx)
               @col[:book_idx]=clean_searchable_text(book_idx)
               @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]
@@ -441,7 +461,7 @@ module SiSU_DbImport
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
               @col[:plaintext]=clean_searchable_text(plaintext)
-              book_idx=data.idx ? data.idx : ''
+              book_idx=book_idx_hash_to_str(data.idx)
               @col[:book_idx]=clean_searchable_text(book_idx)
               t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
-- 
cgit v1.2.3