Merge pull request #362 from nigelgbanks/7.x-sp-inline-datastream-formatting

Attempt to normalize XML data-streams when comparing for equality.

includes/solution_packs.inc

@@ -430,13 +430,21 @@ function islandora_check_object_status(AbstractObject $object_definition) {
       // be equal as Fedora does some XML mangling. In order for C14N to work
       // we need to replace the info:fedora namespace, as C14N hates it.
       // C14N also doesn't normalize whitespace at the end of lines and Fedora
-      // may add some whitespace on some lines.
+      // will sometimes replace new-lines with white-space. So first we strip
+      // leading/tailing white-space and replace all new-lines within the xml
+      // document to account for Fedora's weird formatting.
+      $xsl = new DOMDocument();
+      $xsl->load(drupal_get_path('module', 'islandora') . '/xml/strip_newlines_and_whitespace.xsl');
+      $xslt = new XSLTProcessor();
+      $xslt->importStyleSheet($xsl);
       $object_definition_dom = new DOMDocument();
       $object_definition_dom->preserveWhiteSpace = FALSE;
       $object_definition_dom->loadXML(str_replace('info:', 'http://', $ds->content));
+      $object_definition_dom = $xslt->transformToDoc($object_definition_dom);
       $object_actual_dom = new DOMDocument();
       $object_actual_dom->preserveWhiteSpace = FALSE;
       $object_actual_dom->loadXML(str_replace('info:', 'http://', $existing_object[$ds->id]->content));
+      $object_actual_dom = $xslt->transformToDoc($object_actual_dom);
 
       // Fedora changes the xml structure so we need to cannonize it.
       if ($object_actual_dom->C14N() != $object_definition_dom->C14N()) {

xml/strip_newlines_and_whitespace.xsl

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" media-type="text/xml"/>
+  <xsl:strip-space elements="*"/>
+  <xsl:template match="node()|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="text()">
+    <xsl:value-of select="translate(., '&#xA;', ' ')"/>
+  </xsl:template>
+</xsl:stylesheet>