uc3-dmp-id 0.0.57 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11de25d7e0745bdf275b6376dcffa9a5d77edff86e50c8e518d70019b403ee91
-  data.tar.gz: d571d63e40edb7941f3d3e4eef76476ce2dd6dae62f600de8ca1e0ed15d7f5b6
+  metadata.gz: a7f1d4153e4af1ce9ef49c831f2c65d995e177100def3bfc473c10e25647cbf4
+  data.tar.gz: 18d148667df1d518ed423d087d9732c28142691a77ecb74a42e54de2ad544615
 SHA512:
-  metadata.gz: 1d94e13789f31d6681b40028137001d8747627369728c57faa6b14d155ce0187ffe630f4184ef9ab98ad39f568485045cd53cd9e811cfc90bef89df68c56b454
-  data.tar.gz: 7cb53f7d0e216940652f030f0f615409ddada0492c87eb4ffea793162a68876e04d2a5913b2036aa85e7d5c03e975478905797d5aa49c9cdb0db60b76eadca46
+  metadata.gz: f698bfcb7fff04d14481a5a7e4e4c500fe76e88bdbfe13f1791111fc0c0bffa26751786d9ee647774fc1c6a1a1b6675daa27d158c32479bdc387500b535a2b47
+  data.tar.gz: bc0e02218ed69278a5fa3b3a479b396d8b344505809cd4a4a2938bbe4afde9e1db80ec0776e0bac03dd794d04169b52e8ba078534b00d11ed64b387d2a541503

data/lib/uc3-dmp-id/updater.rb

@@ -49,16 +49,16 @@ module Uc3DmpId
       # Don't continue if nothing has changed!
       raise UpdaterError, MSG_DMP_NOT_FOUND if dmp.nil?
 
-puts "Found DMP:"
-puts dmp
-
       errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp['dmp'])
       raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
 
       # Add the DMPHub specific attributes
-      annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
+      owner_org = dmp['dmp']['dmphub_owner_org']
+      annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: dmp['dmp'])
       annotated['dmproadmap_related_identifiers'] = [] if annotated['dmproadmap_related_identifiers'].nil?
-      annotated << { descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url }
+      annotated['dmproadmap_related_identifiers'] << {
+        descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url
+      }
 
 puts "Attached:"
 puts annotated
@@ -78,9 +78,6 @@ puts annotated
       errs = Validator.validate(mode: 'author', json: json)
       return errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
 
-puts "Prov: #{provenance['PK']}, PK IN: #{p_key}, DMP ID: #{json.fetch('dmp_id', {})['identifier']}, PK: #{json['PK']}"
-puts "Processed DMP ID: '#{Helper.dmp_id_to_pk(json: dmp_id)}' == '#{p_key}'"
-
       # Fail if the provenance is not defined
       return [MSG_DMP_FORBIDDEN] unless provenance.is_a?(Hash) && !provenance['PK'].nil?
 

data/lib/uc3-dmp-id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.0.57'
+  VERSION = '0.0.59'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.59
 platform: ruby
 authors:
 - Brian Riley