Merge pull request #240 from datacite/bug_conflic_saving_jsonld

defaults to schema 4version when the metadata is in schema_org, ris ,bibtex, crosrref, codemeta
datacite · Apr 16, 2019 · 01ceb5e · 01ceb5e
2 parents c3e5737 + d724330
commit 01ceb5e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/app/controllers/dois_controller.rb b/app/controllers/dois_controller.rb
@@ -544,6 +544,7 @@ def safe_params
     end
 
     meta = xml.present? ? parse_xml(xml, doi: p[:doi]) : {}
+    p[:schemaVersion] =  METADATA_FORMATS.include?(meta["from"]) ? LAST_SCHEMA_VERSION : p[:schemaVersion]
     xml = meta["string"]
 
     read_attrs = [p[:creators], p[:contributors], p[:titles], p[:publisher],

diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
@@ -46,3 +46,14 @@ class IdentifierError < RuntimeError; end
   "EMEA" => "Europe, Middle East and Africa",
   "AMER" => "Americas"
 }
+
+LAST_SCHEMA_VERSION = "http://datacite.org/schema/kernel-4"
+
+METADATA_FORMATS = [
+  "schema_org",
+  "ris",
+  "bibtex",
+  "citeproc",
+  "crossref",
+  "codemeta"
+]
diff --git a/spec/concerns/crosscitable_spec.rb b/spec/concerns/crosscitable_spec.rb
@@ -332,6 +332,7 @@
       expect(meta["titles"]).to eq([{"title"=>"Hydrological and meteorological investigations in a lake near Kangerlussuaq, west Greenland"}])
       expect(meta["publication_year"]).to eq("2014")
       expect(meta["publisher"]).to eq("PANGAEA")
+      expect(meta["schema_version"]).to eq(nil)
     end
   end
 

diff --git a/spec/fixtures/vcr_cassettes/Doi/parse_xml/from_schema_org_url.yml b/spec/fixtures/vcr_cassettes/Doi/parse_xml/from_schema_org_url.yml