uc3-dmp-id 0.0.56 → 0.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1aafa930278b99e50df087691c0bacc305af75bf449b67e64e82e8031e2711d
-  data.tar.gz: 8f81d11cf31acb8afcea0adb1171b03f8c39f88cb1471125dc34c95f8faedd92
+  metadata.gz: 89e288b9f1ca8dbbdc9696732303aa480fcfa003a3cbb9bdb398abf736fb146f
+  data.tar.gz: 8a96ebca3f45a06f498b2a2af3fa9a5f0831dff5e5c48049b64109308a0c8b5f
 SHA512:
-  metadata.gz: 2145330c697fdc2c9d3ebbd52a9cf4130725c9e9e1a9bab724758198b90e6f9f5c897442c1244d26848fa118269665891aefbc3f696a89a919eb9fcd629b100f
-  data.tar.gz: d7ba392936d2ab33b810455c4bb1ba530b346e1b618f22d311ec75eb0ab471b038def5ca0fe171d2f28950bab8327d176fd56bcd3e03e2265e3863e89cdbc0a3
+  metadata.gz: 5e601be486758f86c56e430ef1d3b154c34f775b0b8ae345e78eb37e8ef8976532ce885fa403b51d0e91d4cdd080bf06be388bade02e465cd2526a4a4ade2525
+  data.tar.gz: cc2b2a727c0fe43df07931072df6a95a0aff7b32bed1dc9924a27d3e24a8977111d212c532028d1b2724200bcd482052c936235e0ab8443576c95101c15eb4e2

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

@@ -49,11 +49,12 @@ module Uc3DmpId
       # Don't continue if nothing has changed!
       raise UpdaterError, MSG_DMP_NOT_FOUND if dmp.nil?
 
-      errs = _updateable?(provenance: provenance, p_key: p_key, json: 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 }
 
@@ -75,9 +76,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.56'
+  VERSION = '0.0.58'
 end

metadata

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