include doi in xml validation error messages. #690

app/models/datacite_doi.rb

@@ -107,11 +107,13 @@ def self.import_in_bulk(ids, options = {})
                                                   }
 
     # report errors
-    errors_in_response =
-      response["items"].select { |k, _v| k.values.first["error"].present? }
-    errors += errors_in_response.length
-    errors_in_response.each do |item|
-      Rails.logger.error "[Elasticsearch] " + item.inspect
+    if response["errors"]
+      errors_in_response =
+        response["items"].select { |k, _v| k.values.first["error"].present? }
+      errors += errors_in_response.length
+      errors_in_response.each do |item|
+        Rails.logger.error "[Elasticsearch] " + item.inspect
+      end
     end
 
     if errors > 1

app/models/other_doi.rb

@@ -135,11 +135,13 @@ def self.import_in_bulk(ids, options = {})
                                                   }
 
     # report errors
-    errors_in_response =
-      response["items"].select { |k, _v| k.values.first["error"].present? }
-    errors += errors_in_response.length
-    errors_in_response.each do |item|
-      Rails.logger.error "[Elasticsearch] " + item.inspect
+    if response["errors"]
+      errors_in_response =
+        response["items"].select { |k, _v| k.values.first["error"].present? }
+      errors += errors_in_response.length
+      errors_in_response.each do |item|
+        Rails.logger.error "[Elasticsearch] " + item.inspect
+      end
     end
 
     if errors > 1

app/validators/xml_schema_validator.rb

@@ -45,7 +45,7 @@ def validate_each(record, _attribute, value)
           http://datacite.org/schema/kernel-2.2
         ].include?(record.schema_version)
       record.errors[:xml] <<
-        "Schema #{record.schema_version} is no longer supported"
+        "DOI #{record.uid}: Schema #{record.schema_version} is no longer supported"
       return false
     end
 
@@ -59,8 +59,9 @@ def validate_each(record, _attribute, value)
     ) do |_sum, error|
       location, _level, source, text = error.message.split(": ", 4)
       line, column = location.split(":", 2)
+      title = "DOI " + record.uid
       if line.present?
-        title = text.to_s.strip + " at line #{line}, column #{column}"
+        title += ": " + text.to_s.strip + " at line #{line}, column #{column}"
       end
       source = source.split("}").last[0..-2] if line.present?
       source = schema_attributes(source) if source.present?

spec/requests/datacite_dois_spec.rb

@@ -2195,7 +2195,7 @@
         post "/dois", valid_attributes, headers
 
         expect(last_response.status).to eq(422)
-        expect(json.fetch("errors", nil)).to eq([{ "source" => "xml", "title" => "No matching global declaration available for the validation root. at line 2, column 0", "uid" => "10.14454/10703" }])
+        expect(json.fetch("errors", nil)).to eq([{ "source" => "xml", "title" => "DOI 10.14454/10703: No matching global declaration available for the validation root. at line 2, column 0", "uid" => "10.14454/10703" }])
       end
     end
 
@@ -2641,7 +2641,7 @@
         post "/dois", not_valid_attributes, headers
 
         expect(last_response.status).to eq(422)
-        expect(json["errors"]).to eq([{ "source" => "creators", "title" => "Missing child element(s). Expected is ( {http://datacite.org/schema/kernel-4}creator ). at line 4, column 0", "uid" => "10.14454/4k3m-nyvg" }])
+        expect(json["errors"]).to eq([{ "source" => "creators", "title" => "DOI 10.14454/4k3m-nyvg: Missing child element(s). Expected is ( {http://datacite.org/schema/kernel-4}creator ). at line 4, column 0", "uid" => "10.14454/4k3m-nyvg" }])
       end
     end