From d348ae931a17901eda839ef9501e13c9be51e913 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 20 Apr 2010 19:12:58 -0400
Subject: reverts unique words list column and indexes; fix for drop indexes;
 changelog & version update

* reverts unique word list column on doc_objects and endnotes and associated
  indexes, may reintroduce at a later time

* db_drop, drop TEXT indexes for sqlite only

* update: changelog, version date
---
 lib/sisu/v2/db_import.rb | 19 -------------------
 1 file changed, 19 deletions(-)

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

diff --git a/lib/sisu/v2/db_import.rb b/lib/sisu/v2/db_import.rb
index e351f6fc..0e2db8e3 100644
--- a/lib/sisu/v2/db_import.rb
+++ b/lib/sisu/v2/db_import.rb
@@ -267,8 +267,6 @@ module SiSU_DB_import
               @col[:plaintext]=@col[:body].dup
               @col[:plaintext]=strip_markup(@col[:plaintext])
               @col[:plaintext]=clean_searchable_text(@col[:plaintext])
-              @col[:words]=@col[:plaintext].dup
-              @col[:words]=unique_words(@col[:words])
               if @en[0]; @en_a,@en_z=@en[0].first,@en[0].last
               end
               if @en_ast[0]; @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last
@@ -303,8 +301,6 @@ module SiSU_DB_import
               @col[:plaintext]=@col[:body].dup
               @col[:plaintext]=strip_markup(@col[:plaintext])
               @col[:plaintext]=clean_searchable_text(@col[:plaintext])
-              @col[:words]=@col[:plaintext].dup
-              @col[:words]=unique_words(@col[:words])
               @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]
@@ -332,8 +328,6 @@ module SiSU_DB_import
               @col[:plaintext]=@col[:body].dup
               @col[:plaintext]=strip_markup(@col[:plaintext])
               @col[:plaintext]=clean_searchable_text(@col[:plaintext])
-              @col[:words]=@col[:plaintext].dup
-              @col[:words]=unique_words(@col[:words])
               @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]
@@ -361,8 +355,6 @@ module SiSU_DB_import
               @col[:plaintext]=@col[:body].dup
               @col[:plaintext]=strip_markup(@col[:plaintext])
               @col[:plaintext]=clean_searchable_text(@col[:plaintext])
-              @col[:words]=@col[:plaintext].dup
-              @col[:words]=unique_words(@col[:words])
               @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]
@@ -403,8 +395,6 @@ module SiSU_DB_import
               @col[:plaintext]=@col[:body].dup
               @col[:plaintext]=strip_markup(@col[:plaintext])
               @col[:plaintext]=clean_searchable_text(@col[:plaintext])
-              @col[:words]=@col[:plaintext].dup
-              @col[:words]=unique_words(@col[:words])
               t=SiSU_DB_tuple::Load_documents.new(@conn,@col,@opt,@file)
               @tuple_array << t.tuple
               @en,@en_ast,@en_pls=[],[],[]
@@ -422,8 +412,6 @@ module SiSU_DB_import
                   special_character_escape(txt)
                   body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt)
                   strip_markup(txt)
-                  words=txt.dup
-                  words=unique_words(words)
                   if txt.size > (SiSU_DB_columns::Column_size.new.endnote_clean - 1)
                     puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n"
                     open("#{Dir.pwd}/pg_documents_error_log",'a') do |error|
@@ -438,7 +426,6 @@ module SiSU_DB_import
                       :nr      => nr,
                       :txt     => txt,
                       :body    => body,
-                      :words   => words,
                       :ocn     => @col[:ocn],
                       :ocnd    => @col[:ocnd],
                       :ocns    => @col[:ocns],
@@ -463,8 +450,6 @@ module SiSU_DB_import
                   special_character_escape(txt)
                   body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt)
                   strip_markup(txt)
-                  words=txt.dup
-                  words=unique_words(words)
                   if txt.size > (SiSU_DB_columns::Column_size.new.endnote_clean - 1)
                     puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n"
                     open("#{Dir.pwd}/pg_documents_error_log",'a') do |error|
@@ -479,7 +464,6 @@ module SiSU_DB_import
                       :nr      => nr,
                       :txt     => txt,
                       :body    => body,
-                      :words   => words,
                       :ocn     => @col[:ocn],
                       :ocnd    => @col[:ocnd],
                       :ocns    => @col[:ocns],
@@ -504,8 +488,6 @@ module SiSU_DB_import
                   special_character_escape(txt)
                   body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt)
                   strip_markup(txt)
-                  words=txt.dup
-                  words=unique_words(words)
                   if txt.size > (SiSU_DB_columns::Column_size.new.endnote_clean - 1)
                     puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n"
                     open("#{Dir.pwd}/pg_documents_error_log",'a') do |error|
@@ -520,7 +502,6 @@ module SiSU_DB_import
                       :nr      => nr,
                       :txt     => txt,
                       :body    => body,
-                      :words   => words,
                       :ocn     => @col[:ocn],
                       :ocnd    => @col[:ocnd],
                       :ocns    => @col[:ocns],
-- 
cgit v1.2.3