uri_service 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d86291e7f55d8b02a1bda38a3ce2442c57369ed
-  data.tar.gz: 1646c0c6ac51556df8823c9c23db7e1a64682692
+  metadata.gz: bc7a8ad42646a876ba2d722a8635dd64d0ec25d8
+  data.tar.gz: 77102259da8003218eb289fc4dae9f9eb25c0672
 SHA512:
-  metadata.gz: 7b9a6958a9f48b28a238d79d66ac490e24317d1ffffaa4bfa8d5a29d6fc075b75bcae0c6ff8d6963f61937f499288b69543adfc59d7b2539ee644c254cf90cf6
-  data.tar.gz: 3c50a6fd5cdf0d0f16092a8fd5be1e83a2af3a8d689cb9b580a339067374e1fc0dbcbe23836cfc7130d71e0b745d9cfa5d1cf170851aac951df09f247b352988
+  metadata.gz: 06aa62d6544f47d4704c8ae71e1cb7f7482e42bc97056e556d0999f75b522fc3b35edd110c74e40ea41fff8e09427081114179c551259cafca94d515cb45e540
+  data.tar.gz: eddc0dfab80498102100b6971a0ce4bb26a00a893c1da0f374961cf3d8d3ac185755215b3cdc7815f0f2a9463e97a70aad6a674e8b1f4d0a53fc73d61038ef80

data/lib/uri_service/client.rb

@@ -21,6 +21,39 @@ class UriService::Client
     @rsolr_pool = ConnectionPool.new( size: opts['solr']['pool_size'], timeout: (opts['solr']['pool_timeout'].to_f/1000.to_f) ) { RSolr.connect(:url => opts['solr']['url']) }
   end
   
+  def reindex_all_terms(print_progress_to_console=false)
+    self.handle_database_disconnect do
+      
+      if print_progress_to_console
+        puts "Getting database term count..."
+        total = @db[UriService::TERMS].count
+        reindex_counter = 0
+        puts "Number of terms to index: #{total.to_s}"
+        puts ""
+      end
+      
+      # Need to use unambiguous order when using paged_each
+      @db[UriService::TERMS].order(:id).paged_each(:rows_per_fetch=>100) do |term_db_row|
+        self.send_term_to_solr(
+          term_db_row[:vocabulary_string_key],
+          term_db_row[:value],
+          term_db_row[:uri],
+          JSON.parse(term_db_row[:additional_fields]),
+          term_db_row[:is_local],
+        false)
+        
+        if print_progress_to_console
+          reindex_counter += 1
+          print "\rIndexed #{reindex_counter.to_s} of #{total.to_s}"
+        end
+      end
+      
+      puts "\n" + "Committing solr updates..." if print_progress_to_console
+      self.do_solr_commit
+      puts "Done." if print_progress_to_console
+    end
+  end
+  
   def disconnect!
     unless @db.nil?
       db_reference = @db
@@ -60,30 +93,34 @@ class UriService::Client
   end
   
   def create_required_tables
-    current_tables = @db.tables
+    self.handle_database_disconnect do
     
-    unless current_tables.include?(UriService::VOCABULARIES)
-      @db.create_table UriService::VOCABULARIES do |t|
-        primary_key :id
-        String :string_key, size: 255, index: true, unique: true
-        String :display_label, size: 255
+      current_tables = @db.tables
+      
+      unless current_tables.include?(UriService::VOCABULARIES)
+        @db.create_table UriService::VOCABULARIES do |t|
+          primary_key :id
+          String :string_key, size: 255, index: true, unique: true
+          String :display_label, size: 255
+        end
+      else
+        puts 'Skipped creation of table ' + UriService::VOCABULARIES.to_s + ' because it already exists.'
       end
-    else
-      puts 'Skipped creation of table ' + UriService::VOCABULARIES.to_s + ' because it already exists.'
-    end
-    
-    unless current_tables.include?(UriService::TERMS)
-      @db.create_table UriService::TERMS do |t|
-        primary_key :id
-        String :vocabulary_string_key, size: 255, index: true
-        String :uri, text: true # This needs to be a text field because utf8 strings cannot be our desired 2000 characters long in MySQL. uri_hash will be used to verify uniqueness.
-        String :uri_hash, fixed: true, size: 64, unique: true
-        String :value, text: true
-        TrueClass :is_local, default: false
-        String :additional_fields, text: true
+      
+      unless current_tables.include?(UriService::TERMS)
+        @db.create_table UriService::TERMS do |t|
+          primary_key :id
+          String :vocabulary_string_key, size: 255, index: true
+          String :uri, text: true # This needs to be a text field because utf8 strings cannot be our desired 2000 characters long in MySQL. uri_hash will be used to verify uniqueness.
+          String :uri_hash, fixed: true, size: 64, unique: true
+          String :value, text: true
+          TrueClass :is_local, default: false
+          String :additional_fields, text: true
+        end
+      else
+        puts 'Skipped creation of table ' + UriService::TERMS.to_s + ' because it already exists.'
       end
-    else
-      puts 'Skipped creation of table ' + UriService::TERMS.to_s + ' because it already exists.'
+      
     end
   end
   
@@ -421,6 +458,12 @@ class UriService::Client
     end
   end
   
+  def do_solr_commit
+    @rsolr_pool.with do |rsolr|
+      rsolr.commit
+    end
+  end
+  
 end
 
 class UriService::InvalidAdditionalFieldKeyError < StandardError;end

data/lib/uri_service/version.rb

@@ -1,6 +1,6 @@
 module UriService
   
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_service
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Eric O'Hanlon