From 7e7fe5bf72207189906feed275a96f86df2a5573 Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin.fenner@datacite.org>
Date: Thu, 27 Dec 2018 08:30:04 +0100
Subject: [PATCH] make metadata import more flexible

---
 app/models/concerns/crosscitable.rb | 2 +-
 app/models/doi.rb                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/crosscitable.rb b/app/models/concerns/crosscitable.rb
index aefc708b5..962db7090 100644
--- a/app/models/concerns/crosscitable.rb
+++ b/app/models/concerns/crosscitable.rb
@@ -92,7 +92,7 @@ def well_formed_xml(string)
     end
   
     def from_xml(string)
-      return nil unless string.start_with?('<?xml version=')
+      return nil unless string.start_with?('<?xml version=') || string.start_with?('<resource ')
 
       doc = Nokogiri::XML(string) { |config| config.strict.noblanks }
       doc.to_xml.strip
diff --git a/app/models/doi.rb b/app/models/doi.rb
index 39c52e18a..142f3c898 100644
--- a/app/models/doi.rb
+++ b/app/models/doi.rb
@@ -345,7 +345,7 @@ def self.import_one(doi_id: nil)
       return nil
     end
 
-    string = doi.current_metadata.present? && doi.current_metadata.xml.to_s.start_with?('<?xml version=') ? doi.current_metadata.xml.force_encoding("UTF-8") : nil
+    string = doi.current_metadata.present? ? doi.from_xml(doi.current_metadata.xml).to_s.force_encoding("UTF-8").presence : nil
     unless string.present?
       logger.error "[MySQL] No metadata for DOI " + doi.doi + " found: " + doi.current_metadata.inspect
       return nil
@@ -397,7 +397,7 @@ def self.import_by_day(options={})
     Doi.where(created: from_date.midnight..from_date.end_of_day).find_each do |doi|
       begin
         # ignore broken xml
-        string = doi.current_metadata.present? && doi.current_metadata.xml.to_s.start_with?('<?xml version=') ? doi.current_metadata.xml.force_encoding("UTF-8") : nil
+        string = doi.current_metadata.present? ? doi.from_xml(doi.current_metadata.xml).to_s.force_encoding("UTF-8").presence : nil
         unless string.present?
           logger.error "[MySQL] No metadata for DOI " + doi.doi + " found."
           return nil