From 9a86d6c3bcef7d5156ee75ab75a98227966e4e26 Mon Sep 17 00:00:00 2001
From: Mark Jordan <mjordan@sfu.ca>
Date: Wed, 29 Jan 2020 03:48:19 +0000
Subject: [PATCH 1/2] Work on #1411.

---
 src/Services/XMLTransform.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Services/XMLTransform.php b/src/Services/XMLTransform.php
index 2a0f9807..600728f9 100644
--- a/src/Services/XMLTransform.php
+++ b/src/Services/XMLTransform.php
@@ -82,6 +82,12 @@ class XMLTransform extends ServiceProviderBase {
     }
     $xml->registerXPathNamespace('fits', 'http://hul.harvard.edu/ois/xml/ns/fits/fits_output');
     $fits_metadata = $this->islandoraFitsChildXpath($xml);
+
+    // Get the value of the 'externalIdentifier' element generated by Droid.
+    if ($xml->identification->identity->externalIdentifier['type'] == 'puid') {
+      $puid = $xml->identification->identity->externalIdentifier;
+    }
+
     $headers = [
       'label' => t('Field'),
       'value' => t('Value'),
@@ -94,6 +100,7 @@ class XMLTransform extends ServiceProviderBase {
       ];
     }
     else {
+      $fits_metadata['Droid'] = ['PUID' => $puid];
       foreach ($fits_metadata as $tool_name => $vals_array) {
         $variables['islandora_fits_data'][$tool_name] = [];
         $rows = &$variables['islandora_fits_data'][$tool_name];

From 28ca50d2d55b3b720208e49fc695201dc4ca4fac Mon Sep 17 00:00:00 2001
From: Mark Jordan <mjordan@sfu.ca>
Date: Wed, 29 Jan 2020 16:39:26 +0000
Subject: [PATCH 2/2] Work on #1411.

---
 src/Services/XMLTransform.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Services/XMLTransform.php b/src/Services/XMLTransform.php
index 600728f9..7accd281 100644
--- a/src/Services/XMLTransform.php
+++ b/src/Services/XMLTransform.php
@@ -100,7 +100,9 @@ class XMLTransform extends ServiceProviderBase {
       ];
     }
     else {
-      $fits_metadata['Droid'] = ['PUID' => $puid];
+      if ($xml->identification->identity->externalIdentifier['type'] == 'puid') {
+        $fits_metadata['Droid'] = ['PUID' => $puid];
+      }
       foreach ($fits_metadata as $tool_name => $vals_array) {
         $variables['islandora_fits_data'][$tool_name] = [];
         $rows = &$variables['islandora_fits_data'][$tool_name];