bulk_ops 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b52469608636bbd2fc39c85bdc717b1c1777b7a5fa468b9e40137217b9ee0fe
-  data.tar.gz: 3c8a65f05674b6d43fa3d7a06bdc7a2a0424d56378fdf762dfde917c9c234575
+  metadata.gz: 58a1fcfbb6f75f1a90103383bf9d77afc7912db5e837d57e7f514a0d2620646b
+  data.tar.gz: c6e74c188710b832d14a62c8622c7d4b116b3fc24069bce83ef044f3c1de7bf7
 SHA512:
-  metadata.gz: 7e3386a5f0a2f33edac1eeb47cf6cfb95fbc11cb01d9c35ae7a547004d86c41d7fb390b1f3e1d429af3302e95107793b46522091afbb673faadca12facf79d34
-  data.tar.gz: 332a0abf7e52d7ac298c8b82bb0f79432e20a3432f095f6df9829b6a6827aa1b4286c8ea972484133e0be35d8fae9325a0435211bd0dba7900a0f677782adb35
+  metadata.gz: 629745639d8de5bdb9ced3eaa7473721d33ed87beb2d6e7af100306e5177545ee65419ee172a7eaa900e2e94434437f6236209f6fe00c5b26dd4b21975096687
+  data.tar.gz: 38ecec91afaccc17de448fd42d6aab6d295dab4e40a25d786dd57c77af642e978bfdb0f6805341e57494a135a04c8fdd2dc3da4020fe4a2cc9681cec8d7d4e16

data/lib/bulk_ops/operation.rb

@@ -140,6 +140,12 @@ module BulkOps
 
     def check_if_finished
       return unless stage == "running" && !busy?
+
+      # Attempt to resolve each dangling (objectless) relationships
+      BulkOps::Relationship.where(:status => "pending").each do |relationship|
+        relationship.resolve!
+      end
+
       update(stage: accumulated_errors.blank? ? "complete" : "errors" )
       report_errors!
       lift_holds

data/lib/bulk_ops/relationship.rb

@@ -13,7 +13,6 @@ class BulkOps::Relationship < ActiveRecord::Base
   end
 
   def findObject
-    work_type = (relationship_type.downcase == "collection") ? "Collection" : work_proxy.work_type
     case identifier_type
     when "id"
       begin
@@ -29,7 +28,7 @@ class BulkOps::Relationship < ActiveRecord::Base
                                                             params: { fq: query, rows: 100})["response"]["docs"].first
       if objects.present?
         return ActiveFedora::Base.find(objects.first["id"])
-      elsif work_type == "Collection"
+      elsif relationship_type.downcase == "collection"
         return Collection.create(title: [object_identifier])
       else
         return false
@@ -40,19 +39,18 @@ class BulkOps::Relationship < ActiveRecord::Base
       return false if objects.blank?
       return ActiveFedora::Base.find(objects.first["id"])
     when "row"
-      object_proxy = WorkProxy.find_by(operation_id: work_proxy.operation.id, 
-                                       row_number: object_identifier.to_i)
+      object_proxy = BulkOps::WorkProxy.find_by(operation_id: work_proxy.operation.id, 
+                                                row_number: (object_identifier.to_i - 2))
       ActiveFedora::Base.find(object_proxy.work_id)
     end
   end
 
-  def resolve! ()
+  def resolve!
     unless subject = work_proxy.work and object = self.findObject
       wait!
       return
     end
     implement_relationship! relationship_type, subject, object
-
   end
   
   def implement_relationship!(type,subject,object)

data/lib/bulk_ops/version.rb

@@ -1,3 +1,3 @@
 module BulkOps
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/bulk_ops/work_job.rb

@@ -23,12 +23,6 @@ class BulkOps::WorkJob < ActiveJob::Base
       relationship.resolve!
     end
 
-    # Attempt to resolve each dangling (objectless) relationships using   
-    # this work as an object
-    BulkOps::Relationship.where(:status => "objectless").each do |relationship|
-      relationship.resolve! @work.id
-    end
-
     # Delete any UploadedFiles. These take up tons of unnecessary disk space.
     @work.file_sets.each do |fileset|
       if uf = Hyrax::UploadedFile.find_by(file: fileset.label)
@@ -40,8 +34,7 @@ class BulkOps::WorkJob < ActiveJob::Base
     @work_proxy.lift_hold
 
     # Check if the parent operation is finished
-    # and do any cleanup if so
-    
+    # and do any cleanup if so    
     if @work_proxy.operation.present? && @work_proxy.operation.respond_to?(:check_if_finished)
       @work_proxy.operation.check_if_finished 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk_ops
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails