bulk_ops 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b118e0e6b4039a3fff3174e553faaa05c447c09b08c3ea5ad013ba8922b09084
-  data.tar.gz: d27b01baf50a45da61d1131f8a84a61bd0b2db6bbfd23742a49b508e55cdecd3
+  metadata.gz: 27b9b67583cbf4ca808867661196e5bb8a6b95490b3a377dd85d11a91d0a41fb
+  data.tar.gz: 508dbf4a72146f7a893851aec847bb9bb82a399765135dfde6daa6eec0a4d121
 SHA512:
-  metadata.gz: 75b9f53d064c5cdef7044c7b727fe36d2ccd1fcfb50bf522b5c45375fb7c6f548a9fbe1bc88ef4cfe757dac1f44af4d4b2d503246a98b65891883c1e08d1dc75
-  data.tar.gz: 32faf9307eb850f7a306d7e3c9c088b53faf63fd9a25578c04b6facdcb6647eca0fb38c26253c078772d2e49715e559a7b3bc655fa349791dbf33b6070edded1
+  metadata.gz: da715c7235ae2044b2354653b382825078a63f466e542642d995c81b6dd3bb8d8336c13ac84dd811ecefbff4e9e2422c45f1dc39e10b0ea1a4119a6736397ee2
+  data.tar.gz: 9bd37e6481170e1da5ba4494888fb16a1cfa65cc9869edcee87353228a1eb78eefe5f32c87bb7c14f4fc2b6e3ead0ad068901273d8c100e3afbce0d5268e4486

data/lib/bulk_ops/relationship.rb

@@ -10,11 +10,11 @@ class BulkOps::Relationship < ActiveRecord::Base
     
     # Attempt to resolve the relationship immediately
     # which might work in the case of updates
-    resolve!
+#    resolve!
   end
 
   def findObject
-    case identifier_type.downcase
+    case (identifier_type || "").downcase
     when "id"
       begin
       object = ActiveFedora::Base.find(object_identifier)
@@ -29,7 +29,7 @@ class BulkOps::Relationship < ActiveRecord::Base
                                                             params: { fq: query, rows: 100})["response"]["docs"]
       if objects.present?
         return ActiveFedora::Base.find(objects.first["id"])
-      elsif relationship_type.downcase == "collection"
+      elsif (relationship_type || "").downcase == "collection"
         return Collection.create(title: [object_identifier])
       else
         return false
@@ -59,22 +59,22 @@ class BulkOps::Relationship < ActiveRecord::Base
   end
 
   def insert_among_children(object,new_member)
-    return nil unless ["parent"].include?(relationship_type.downcase)
+    return nil unless ["parent"].include?((relationship_type || "").downcase)
     prev_sib_id = previous_sibling
     # This is the id of the WorkProxy associate with the most recent sibling work
     # that might be fully ingested. If is it not fully ingested, we will move on 
     # to the preceding sibling.
     while prev_sib_id.present? 
-      prev_sib_proxy = BulkOps::WorkProxy.find(previous_sibling)
+      prev_sib_proxy = BulkOps::WorkProxy.find(prev_sib_id)
       # Check if the previous sibling is fully ingested 
       # and get its index among its siblings (if it has been successfully attached to the parent)
       prev_sib_index = object.ordered_member_ids.index(prev_sib_proxy.work_id) if prev_sib_proxy.work_id.present?
       # Insert the new member among its siblings if we found the right place
       return object.ordered_members.to_a.insert(prev_sib_index+1, new_member) if prev_sib_index.present?
       # Otherwise, pull up the sibling's relationship field to check if it sibling has a sibling before it
-      sib_relationship = prev_sib_proxy.relationships.find_by(relationship_type: relationship_type, object_identifier: object_identifier)
+      sib_relationship = prev_sib_proxy.relationships.find{|rel| rel.findObject.id == object.id }
       # If we can't find an ingested sibling among the ordered members,
-      # make this work the first member.
+      # break this loop and make this work the first member.
       break unless sib_relationship.present?
       prev_sib_id = sib_relationship.previous_sibling
     end
@@ -83,9 +83,11 @@ class BulkOps::Relationship < ActiveRecord::Base
   end
   
   def implement_relationship!(type,subject,object)
-    case type.downcase
+    case (type || "").downcase
     when "parent"
       unless object.member_ids.include? subject.id
+        object.reload
+        object.save
         object.ordered_members = insert_among_children(object, subject)
         object.save
       end
@@ -95,11 +97,6 @@ class BulkOps::Relationship < ActiveRecord::Base
         subject.ordered_members << object
         subject.save
       end
-    when "collection"
-      unless object.member_object_ids.include? subject.id
-        object.add_members([subject.id])
-        object.save
-      end
     when "order"
       #TODO - implement this - related to ordering of filesets
       

data/lib/bulk_ops/version.rb

@@ -1,3 +1,3 @@
 module BulkOps
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/bulk_ops/work_proxy.rb

@@ -46,7 +46,7 @@ class BulkOps::WorkProxy < ActiveRecord::Base
     metadata.merge! interpret_file_fields(raw_data)
     metadata.merge! interpret_controlled_fields(raw_data)
     metadata.merge! interpret_scalar_fields(raw_data)
-    metadata.merge! interpret_relationship_fields(raw_data )
+    metadata.merge! interpret_relationship_fields(raw_data)
     metadata.merge! interpret_option_fields(raw_data)
     metadata = setAdminSet(metadata)
     metadata = setMetadataInheritance(metadata)
@@ -293,9 +293,9 @@ class BulkOps::WorkProxy < ActiveRecord::Base
     return {}
   end
 
-  def interpret_relationship_fields raw_data, row_number=nil
+  def interpret_relationship_fields(raw_data)
     metadata = {}
-    raw_data do |field,value|
+    raw_data.each do |field,value|
       next if value.blank?  or field.blank?
       field = field.to_s              
       value = unescape_csv(value)
@@ -305,47 +305,49 @@ class BulkOps::WorkProxy < ActiveRecord::Base
 
       if (split = field.split(":")).count == 2
         identifier_type = split.last
-        field = split.first.to_s
+        relationship_type = split.first.to_s
+      else
+        relationship_type = field
       end
 
-      relationship_type = normalize_relationship_field_name(field)
+      relationship_type = normalize_relationship_field_name(relationship_type)
       case relationship_type
       when "order"
-         # If the field specifies the object's order among siblings (usually for multiple filesets)
+         # If the field specifies the object's order among siblings 
         update(order: value.to_f)
+        next
       when "collection"
         # If the field specifies the name or ID of a collection,
         # find or create the collection and update the metadata to match
         col = find_or_create_collection(value)
         ( metadata[:member_of_collection_ids] ||= [] ) << col.id if col
+        next
       when "parent", "child"
-        object_id = interpret_relationship_value(value,identifier_type)
-      end
-      
-      # correctly interpret the notation "id:a78C2d81"
-      if ((split = value.split(":")).count == 2)
-        identifier_type = split.first
-        value = split.last
-      end
-
-      interpret_relationship_value(identifier_type, value)
-
-      relationship_parameters =  { work_proxy_id: id,
-                                      identifier_type: ref_type,
-                                      relationship_type: normfield,
-                                      object_identifier: value,
-                                      status: "new"}
-
-      #add previous sibling link if necessary
-      previous_value = op.metadata[row_number-1][field]
-      if previous_value.present? && (ref_type == "parent")
-        if value == interpret_relationship_value(ref_type, previous_value)
-          relationship_parameters[:previous_sibling] = operation.work_proxies.find_by(row_number: row_number-1).id 
+        
+        # correctly interpret the notation "id:a78C2d81"
+        identifier_type, object_identifier = interpret_relationship_value(identifier_type, value)
+
+        relationship_parameters =  { work_proxy_id: id,
+                                     identifier_type: identifier_type,
+                                     relationship_type: relationship_type,
+                                     object_identifier: object_identifier,
+                                     status: "new"}
+        
+        #add previous sibling link if necessary
+        previous_value = operation.final_spreadsheet[row_number-1][field]
+        # Check if this is a parent relationship, and the previous row also has one
+        if previous_value.present? && (relationship_type == "parent")
+          # Check if the previous row has the same parent as this row
+          if object_identifier == interpret_relationship_value(identifier_type, previous_value, field).last
+            # If so, set the previous sibling parameter on the relationshp 
+            #    to the id for the proxy associated with the previous row
+            relationship_parameters[:previous_sibling] = operation.work_proxies.find_by(row_number: row_number-1).id 
+          end
         end
+        BulkOps::Relationship.create(relationship_parameters)
       end
-      BulkOps::Relationship.create(relationship_parameters)
+      return metadata
     end
-    return metadata
   end
 
   def normalize_relationship_field_name field
@@ -353,19 +355,15 @@ class BulkOps::WorkProxy < ActiveRecord::Base
     RELATIONSHIP_FIELDS.find{|field| normfield.include?(field) }
   end
 
-  def find_previous_parent field
+  def find_previous_parent field="parent"
+    #Return the row number of the most recent preceding row that does
+    # not itself have a parent defined
     i = 0;
-    while (prev_row = operation.metadata[row_number - i])
+    while (prev_row = operation.final_spreadsheet[row_number - i])
       return (row_number - i) if prev_row[field].blank?
     end
   end
 
-  def find_previous_sibling (field,ref_type,object)
-    previous_value = interpret_relationship_value(ref_type,op.metadata[row_number-1][field])
-    return nil unless previous_value == object
-    return 
-  end
-
   def interpret_relationship_value id_type, value, field="parent"
     #Handle "id:20kj4259" syntax if it hasn't already been handled
     if (split = value.to_s.split(":")).count == 2
@@ -376,12 +374,13 @@ class BulkOps::WorkProxy < ActiveRecord::Base
     if id_type == "row"
       if value.to_i < 0
         # if given a negative integer, count backwards from the current row 
-        return row_number - value
+        return [id_type,row_number - value]
       elsif value.to_s.downcase.include?("prev")
         # if given any variation of the word "previous", get the first preceding row with no parent of its own
-        return find_previous_parent(field)
+        return [id_type,find_previous_parent(field)]
       end
     end
+    return [id_type,value]
   end
 
   def unescape_csv(value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk_ops
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails