Merge tag 'sisu_5.6.8' into debian/sid

SiSU 5.6.8

1 files changed, 13 insertions, 16 deletions

diff --git a/lib/sisu/v6/db_import.rb b/lib/sisu/v6/db_import.rb
index 3e2e7271..e61290aa 100644
--- a/lib/sisu/v6/db_import.rb
+++ b/lib/sisu/v6/db_import.rb
@@ -46,9 +46,6 @@
    <http://www.jus.uio.no/sisu>
    <http://www.sisudoc.org>
 
- * Download:
-   <http://www.sisudoc.org/sisu/en/SiSU/download.html>
-
  * Git
    <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
    <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_import.rb;hb=HEAD>
@@ -292,7 +289,7 @@ module SiSU_DbImport
         src=txt_arr.join("\n")
         src=special_character_escape(src)
         @tp[:sisutxt_f],@tp[:sisutxt_i]='sisutxt, ',"'#{src}', "
-        txt=clean_searchable_text(txt_arr)
+        txt=clean_searchable_text_from_document_source(txt_arr)
         #txt=special_character_escape(txt)
         @tp[:fulltxt_f],@tp[:fulltxt_i]='fulltxt, ',"'#{txt}', "
       end
@@ -374,9 +371,9 @@ module SiSU_DbImport
               @col[:body]=special_character_escape(body)
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
-              @col[:plaintext]=clean_searchable_text(plaintext)
+              @col[:plaintext]=clean_searchable_text_from_document_objects(plaintext)
               book_idx=book_idx_hash_to_str(data.idx)
-              @col[:book_idx]=clean_searchable_text(book_idx)
+              @col[:book_idx]=clean_searchable_text_from_document_objects(book_idx)
               if @en[0] then @en_a,@en_z=@en[0].first,@en[0].last
               end
               if @en_ast[0] then @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last
@@ -425,9 +422,9 @@ module SiSU_DbImport
               @col[:body]=special_character_escape(body)
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
-              @col[:plaintext]=clean_searchable_text(plaintext)
+              @col[:plaintext]=clean_searchable_text_from_document_objects(plaintext)
               book_idx=book_idx_hash_to_str(data.idx)
-              @col[:book_idx]=clean_searchable_text(book_idx)
+              @col[:book_idx]=clean_searchable_text_from_document_objects(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]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
@@ -470,9 +467,9 @@ module SiSU_DbImport
               @col[:body]=special_character_escape(body)
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
-              @col[:plaintext]=clean_searchable_text(plaintext)
+              @col[:plaintext]=clean_searchable_text_from_document_objects(plaintext)
               book_idx=book_idx_hash_to_str(data.idx)
-              @col[:book_idx]=clean_searchable_text(book_idx)
+              @col[:book_idx]=clean_searchable_text_from_document_objects(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]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
@@ -501,9 +498,9 @@ module SiSU_DbImport
               @col[:body]=special_character_escape(body)
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
-              @col[:plaintext]=clean_searchable_text(plaintext)
+              @col[:plaintext]=clean_searchable_text_from_document_objects(plaintext)
               book_idx=book_idx_hash_to_str(data.idx)
-              @col[:book_idx]=clean_searchable_text(book_idx)
+              @col[:book_idx]=clean_searchable_text_from_document_objects(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]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
@@ -532,9 +529,9 @@ module SiSU_DbImport
               @col[:body]=special_character_escape(body)
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
-              @col[:plaintext]=clean_searchable_text(plaintext)
+              @col[:plaintext]=clean_searchable_text_from_document_objects(plaintext)
               book_idx=book_idx_hash_to_str(data.idx)
-              @col[:book_idx]=clean_searchable_text(book_idx)
+              @col[:book_idx]=clean_searchable_text_from_document_objects(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]
               @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0]
@@ -603,9 +600,9 @@ module SiSU_DbImport
               @col[:body]=special_character_escape(body)
               plaintext=@col[:body].dup
               plaintext=strip_markup(plaintext)
-              @col[:plaintext]=clean_searchable_text(plaintext)
+              @col[:plaintext]=clean_searchable_text_from_document_objects(plaintext)
               book_idx=book_idx_hash_to_str(data.idx)
-              @col[:book_idx]=clean_searchable_text(book_idx)
+              @col[:book_idx]=clean_searchable_text_from_document_objects(book_idx)
               t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               @en,@en_ast,@en_pls=[],[],[]