fix schema 3 validation

datacite · Sep 16, 2020 · a679a78 · a679a78
1 parent 4073275
commit a679a78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/validators/xml_schema_validator.rb b/app/validators/xml_schema_validator.rb
@@ -25,6 +25,8 @@ def get_valid_kernel(sv)
       "http://datacite.org/schema/kernel-3" => "kernel-3",
       "http://datacite.org/schema/kernel-4.0" => "kernel-4",
       "http://datacite.org/schema/kernel-4.1" => "kernel-4",
+      "http://datacite.org/schema/kernel-4.2" => "kernel-4",
+      "http://datacite.org/schema/kernel-4.3" => "kernel-4",
       "http://datacite.org/schema/kernel-4" => "kernel-4"
     }
 
@@ -35,7 +37,7 @@ def validate_each(record, attribute, value)
     kernel = get_valid_kernel(record.schema_version)
     return false unless kernel.present?
 
-    if record.new_record? && ["http://datacite.org/schema/kernel-2.2", "http://datacite.org/schema/kernel-2.2"].include?(record.schema_version)
+    if record.new_record? && ["http://datacite.org/schema/kernel-2.1", "http://datacite.org/schema/kernel-2.2"].include?(record.schema_version)
       record.errors[:xml] << "Schema #{record.schema_version} is no longer supported"
       return false
     end

diff --git a/spec/requests/datacite_dois_spec.rb b/spec/requests/datacite_dois_spec.rb
@@ -2170,7 +2170,7 @@
         post '/dois', valid_attributes, headers
 
         expect(last_response.status).to eq(422)
-        expect(json.fetch('errors', nil)).to eq([{"source"=>"xml", "title"=>"Schema http://datacite.org/schema/kernel-2.2 is no longer supported"}])
+        expect(json.fetch('errors', nil)).to eq([{"source"=>"xml", "title"=>"No matching global declaration available for the validation root. at line 2, column 0"}])
       end
     end