diff --git a/src/Controller/RdfMappingsReportController.php b/src/Controller/RdfMappingsReportController.php index 38a80994..1be16316 100644 --- a/src/Controller/RdfMappingsReportController.php +++ b/src/Controller/RdfMappingsReportController.php @@ -100,15 +100,20 @@ class RdfMappingsReportController extends ControllerBase { ]; $vocab_table_rows = []; foreach ($terms as $t) { + $ld_uri = NULL; $term = Term::load($t->tid); foreach ($uri_fields as $uri_field) { if ($term->hasField($uri_field) && !$term->get($uri_field)->isEmpty()) { - $uri = $term->get($uri_field)->first()->getValue(); + $ld_uri = $term->get($uri_field)->first()->getValue(); continue; } } - if (isset($uri) && !is_null($uri) && array_key_exists('uri', $uri)) { - $vocab_table_rows[] = [$term->getName(), $term->id(), $uri['uri']]; + if (is_array($ld_uri) && array_key_exists('uri', $ld_uri)) { + $vocab_table_rows[] = [ + $term->getName(), + $term->id(), + $ld_uri['uri'], + ]; } else { $vocab_table_rows[] = [$term->getName(), $term->id(), t('None')]; diff --git a/src/IslandoraUtils.php b/src/IslandoraUtils.php index 08d02e3a..c4bfcb2f 100644 --- a/src/IslandoraUtils.php +++ b/src/IslandoraUtils.php @@ -302,7 +302,8 @@ class IslandoraUtils { $field_map = $this->entityFieldManager->getFieldMap(); $fields = []; foreach ($field_map['taxonomy_term'] as $field_name => $field_data) { - if ($field_data['type'] == 'authority_link') { + $data_types = ['authority_link', 'field_external_authority_link']; + if (in_array($field_data['type'], $data_types)) { $fields[] = $field_name; } }