caboose-rets 0.0.70 → 0.0.71

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWExNTE4ZTRhZDM1MDUxY2YwNzllZTA4ZjgxMTJhZjNmNjQ2ZDdhNg==
+    NTc1MzEzZTk0Yjk3NGFlY2UyMWJhMTk5NmExNWI0ZDI1YWE5NmVlZA==
   data.tar.gz: !binary |-
-    ZmM4YmY1MWM3MWUxOGExMjY2M2NhYmVlYzA1MWRhOWVmMWE1ZTY2OA==
+    OGQyNDczYjQyNThjMzM2NDAzM2QzNDZhNTI3MDY2NTAxNmExYTJjMw==
 SHA512:
   metadata.gz: !binary |-
-    MjcwNzQyZjkwMjg5NTYwN2M1ODkxMDhkNzQxNWQ5ZGVlYTQ5ZDZkYjkxY2Qy
-    YzAxZDAxMTFmNjI4Y2U0ODYzNmQyM2YwMzIyOGUzNjkzNDUwMWRlNjFkMTdl
-    OGVhN2QxMjZmZDRhNWVlNzI2MDJhNjRjYzRiZDEyNTg4ZDU2Mjk=
+    YzhjY2Y1YWMxYzg1YWIyNzNiZGI0ZWM2OWZiY2ExNDFjNzJkYjZlMzM0OTJi
+    N2RlNzcxZjhmNjQ1YWFjOWJiY2NlNjQ2OGI5YWIyZWI4MjMyZGZhMTliYTQy
+    NzliNmIxYTUxYjI1OGYxNjU1ODllNzdkZDcxNTgwMTMxNTUzMjg=
   data.tar.gz: !binary |-
-    OGYzODJjYTBmNzQwMTI4MWUyZDBkNDMwMGU3ZmY1YmU5MjdjZGE5ZDMyMzZi
-    YzI0NDgwNmVjZTQ5NDE5ODY4NzZmYTEzODIwM2I1YmQ4N2JlMWMwMzgwMmM4
-    ZTY0OTg4OTcxNWI5MWY2MjJhYTllZTE0ZmUzYTI1Y2U3Y2NhMmM=
+    N2Q4YWMzODc5YjY1YzlkZmUxOWU5OTYxNjVmZjNlN2NlYWU4ODQzMDVmODky
+    NWZkZTVkOTE5NGNhYjI1ZjM5MTg0MDRjNGVjMDQzYzJlYjY3YzYwYTcwYmY2
+    ZWY5MmUzZjhlNjdkZWY5M2UzMDE0MmRkNjA2Mjk1OTA2ZGU0YTE=

data/app/models/caboose_rets/rets_importer.rb

@@ -254,7 +254,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     end
     
     # Delete any records in the local database that shouldn't be there
-    puts "- Deleting GFX records for MLS ##{p.mls_acct} in the local database that are not in the remote database..."
+    self.log("- Deleting GFX records for MLS ##{p.mls_acct} in the local database that are not in the remote database...")
     query = "select media_id from rets_media where mls_acct = '#{p.mls_acct}'"
     rows = ActiveRecord::Base.connection.select_all(ActiveRecord::Base.send(:sanitize_sql_array, query))
     local_ids = rows.collect{ |row| row['media_id'] }
@@ -336,10 +336,10 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   def self.purge_helper(class_type, date_modified)
     m = self.meta(class_type)
 
-    puts "Purging #{class_type}..."
+    self.log("Purging #{class_type}...")
     
     # Get the total number of records
-    puts "- Getting total number of records for #{class_type}..."
+    self.log("- Getting total number of records for #{class_type}...")
     params = {
       :search_type => m.search_type,
       :class => class_type,
@@ -354,43 +354,34 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     ids = []
     k = m.remote_key_field
     (0...batch_count).each do |i|
-      puts "- Getting ids for #{class_type} (batch #{i+1} of #{batch_count})..."
-      self.client.search(params.merge({ :select => [k], :limit => 5000, :offset => 5000*i })) do |data|
-        ids << case class_type
-          when 'RES' then data[k] 
-          when 'COM' then data[k] 
-          when 'LND' then data[k] 
-          when 'MUL' then data[k] 
-          when 'OFF' then data[k]  
-          when 'AGT' then data[k]
-          when 'OPH' then data[k].to_i
-          when 'GFX' then data[k]
-        end                
-      end
-    end
+      self.log("- Getting ids for #{class_type} (batch #{i+1} of #{batch_count})...")
+      self.client.search(params.merge({ :select => [k], :limit => 5000, :offset => 5000*i })) do |data|                
+        ids << (class_type == 'OPH' ? data[k].to_i : data[k])        
+      end      
+    end    
 
     # Delete any records in the local database that shouldn't be there
-    puts "- Finding #{class_type} records in the local database that are not in the remote database..."    
+    self.log("- Finding #{class_type} records in the local database that are not in the remote database...")    
     t = m.local_table
     k = m.local_key_field        
     query = "select distinct #{k} from #{t}"
     rows = ActiveRecord::Base.connection.select_all(ActiveRecord::Base.send(:sanitize_sql_array, query))
     local_ids = rows.collect{ |row| row[k] }
     ids_to_remove = local_ids - ids    
-    puts "- Found #{ids_to_remove.count} #{class_type} records in the local database that are not in the remote database."
-    puts "- Deleting #{class_type} records in the local database that shouldn't be there..."
+    self.log("- Found #{ids_to_remove.count} #{class_type} records in the local database that are not in the remote database.")
+    self.log("- Deleting #{class_type} records in the local database that shouldn't be there...")
     query = ["delete from #{t} where #{k} not in (?)", ids_to_remove]
     ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
 
     # Find any ids in the remote database that should be in the local database
-    puts "- Finding #{class_type} records in the remote database that should be in the local database..."
+    self.log("- Finding #{class_type} records in the remote database that should be in the local database...")
     query = "select distinct #{k} from #{t}"
     rows = ActiveRecord::Base.connection.select_all(ActiveRecord::Base.send(:sanitize_sql_array, query))
     local_ids = rows.collect{ |row| row[k] }
     ids_to_add = ids - local_ids    
-    puts "- Found #{ids_to_add.count} #{class_type} records in the remote database that we need to add to the local database."
+    self.log("- Found #{ids_to_add.count} #{class_type} records in the remote database that we need to add to the local database.")
     ids_to_add.each do |id|
-      puts "- Importing #{id}..."
+      self.log("- Importing #{id}...")
       case class_type
         when 'RES' then self.delay.import_residential_property(id, false)
         when 'COM' then self.delay.import_commercial_property(id, false)
@@ -449,7 +440,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     local_ids = rows.collect{ |row| row[k] }
     ids_to_add = ids - local_ids
     ids_to_add.each do |id|
-      puts "Importing #{id}..."
+      self.log("Importing #{id}...")
       case class_type
         when 'RES' then self.delay.import_residential_property(id, false)
         when 'COM' then self.delay.import_commercial_property(id, false)
@@ -482,10 +473,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     task_started = self.lock_task
 
     begin
-      overlap = 30.seconds
-      puts DateTime.now
-      puts self.last_purged
-      puts (DateTime.now - self.last_purged)
+      overlap = 30.seconds      
       if (DateTime.now - self.last_purged).to_i > 1
         self.purge
         self.save_last_purged(task_started)

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.0.70'
+  VERSION = '0.0.71'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
 platform: ruby
 authors:
 - William Barry