diff --git a/README.md b/README.md
index 1917c91..da9ab5b 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,8 @@ Having problems or solved a problem? Check out the Islandora google groups for a
### Q. What elements are necessary in finding aid EAD metadata?
A. Components (`c`, `c01`, `c02`, `c03`, _etc_) *MUST* have `id` attributes unique to the given XML document in order to reliably produce links and relationships. Components *MUST* have a `level` as one of:
+* `recordgrp`
+* `subgrp`
* `series`
* `subseries`
* `file`
diff --git a/includes/blocks.inc b/includes/blocks.inc
index 70cdbf7..512f557 100644
--- a/includes/blocks.inc
+++ b/includes/blocks.inc
@@ -66,6 +66,16 @@ function islandora_manuscript_container_list($object) {
'default' => array(
'select_node' => FALSE,
),
+ 'recordgrp' => array(
+ 'valid_children' => array(
+ 'subgrp',
+ ),
+ ),
+ 'subgrp' => array(
+ 'valid_children' => array(
+ 'series',
+ ),
+ ),
'series' => array(
'valid_children' => array(
'subseries',
diff --git a/includes/ead_html.inc b/includes/ead_html.inc
new file mode 100644
index 0000000..5d2a204
--- /dev/null
+++ b/includes/ead_html.inc
@@ -0,0 +1,311 @@
+ t('Container List'),
+ "container_string" => t('Containers'),
+ "unitid_string" => t('Unit Id'),
+ "physdesc_string" => t('Extent'),
+ "physloc_string" => t('Physical Location'),
+ "langmaterial_string" => t('Language'),
+ "controlaccess_string" => t('Subjects'),
+ "corpname_string" => t('Corporate Names'),
+ "persname_string" => t('Personal Names'),
+ "famname_string" => t('Family Names'),
+ "geogname_string" => t('Geographic Names'),
+ "occupation_string" => t('Occupations'),
+ "subject_string" => t('Other Subjects'),
+ "genreform_string" => t('Genres'),
+ "recordgrp_string" => t('Record Group'),
+ "subgrp_string" => t('Subgroup'),
+ "series_string" => t('Series'),
+ "subseries_string" => t('Subseries'),
+ "otherlevel_string" => t('Section'),
+ "subfonds" => t('Subfonds'),
+ "file_string" => t('File'),
+ "item_string" => t('Item'),
+ );
+
+ $variables['doc'] = $doc = new DOMDocument();
+ $doc->loadXML($variables['object']['EAD']->content);
+
+ // XXX: Need to tag containers in order to work-around a PHP bug. See
+ // islandora_manuscript_lookup_tag() for more details on the bug.
+ // This _could_ be wrapped in version checks, so we only tag when necessary.
+ islandora_manuscript_tag_containers($doc);
+
+ $variables['xslt_doc'] = $xslt_doc = new DOMDocument();
+ $xslt_doc->load(drupal_get_path('module', 'islandora_manuscript') . '/transforms/ead_to_html.xslt');
+}
+
+/**
+ * Process variables for islandora_manuscript_ead_display templates.
+ *
+ * @param array $variables
+ * An associative array containing:
+ * - object: An AbstractObject containing an "EAD" datastream.
+ * - xslt_functions: An array of functions to allow the XSLT to run, as
+ * accepted by XSLTProcessor::registerPhpFunctions().
+ * - xslt_parameters: An associative array mapping namespace URIs to
+ * associative arrays of parameters proper.
+ * - doc: A DOMDocument containing the parsed EAD datastream.
+ * - xslt_doc: A DOMDocument containing the parsed XSLT to run.
+ * This function populates:
+ * - processor: The XSLTProcessor instance which was used.
+ * - markup_doc: A DOMDocument containing the markup to output, after
+ * this function has run.
+ */
+function islandora_manuscript_process_ead_display_variables(&$variables) {
+ $variables['processor'] = $proc = new XSLTProcessor();
+ $proc->importStylesheet($variables['xslt_doc']);
+ foreach ($variables['xslt_parameters'] as $namespace_uri => $parameters) {
+ $proc->setParameter($namespace_uri, $parameters);
+ }
+ $proc->registerPhpFunctions($variables['xslt_functions']);
+ $variables['markup_doc'] = $proc->transformToDoc($variables['doc']);
+ $variables['rendered_ead_html'] = $variables['markup_doc']->saveXML($variables['markup_doc']->documentElement);
+}
+
+
+/**
+ * Tag containers with a unique ID.
+ *
+ * Part of a work around for a PHP bug in which nodesets passed out of XSLTs
+ * are copied.
+ *
+ * @param DOMDocument $doc
+ * A DOMDocument containing a parsed EAD document, in which we will tag all
+ * containers with a document-unique attribute.
+ */
+function islandora_manuscript_tag_containers(DOMDocument $doc) {
+ $xpath = new DOMXPath($doc);
+ $xpath->registerNamespace('ead', 'urn:isbn:1-931666-22-9');
+ foreach ($xpath->query('//ead:container') as $index => $container) {
+ $container->setAttributeNS(ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI, 'container-tag:id', "islandora-manuscript-container-tag:$index");
+ }
+}
+
+/**
+ * Callback used in XSLT to build a query URL.
+ *
+ * @param DOMElement[] $container_array
+ * An array containing a single DOMElement (this is how XSLTProcessor
+ * provides it) representing a "container" inside of an EAD document.
+ * @param DOMElement[] $all
+ * An array containing all container elements in the given EAD document.
+ *
+ * @return string
+ * A string containing a URL to Solr search results for the given container.
+ */
+function islandora_manuscript_build_parented_query_url(array $container_array, array $all) {
+ $object = menu_get_object('islandora_object', 2);
+ if ($object) {
+ $path = "islandora/object/{$object->id}/manuscript/manuscripts";
+ list($container) = $container_array;
+ return url($path, array(
+ 'query' => array(
+ 'f' => islandora_manuscript_build_subfile_query($container, $all),
+ ),
+ ));
+ }
+}
+
+/**
+ * Build a query to filter to the given container.
+ *
+ * @param DOMElement $container
+ * A DOMElement representing the container.
+ *
+ * @return string[]
+ * An array of strings representing Lucene queries... Likely to be used as
+ * filter queries.
+ */
+function islandora_manuscript_build_partial_query(DOMElement $container) {
+ $subqueries = array();
+ $field = islandora_manuscript_findingaid_get_solr_field($container->getAttribute('type'));
+
+ $value = trim($container->nodeValue);
+ if ($value != '') {
+ $subqueries[] = format_string('!field:"!value"', array(
+ '!field' => $field,
+ '!value' => $value,
+ ));
+ }
+
+ return $subqueries;
+}
+
+/**
+ * Build a query to select all items in a given part of a file.
+ *
+ * @param DOMElement $container
+ * An EAD container element for which to build a (part of a) query.
+ * @param DOMElement[] $all
+ * An array of all container elements in the EAD doc... 'Cause the "parent"
+ * attribute can reference any container element.
+ *
+ * @return string[]
+ * An array of Lucene-syntax Solr queries.
+ */
+function islandora_manuscript_build_subfile_query(DOMElement $container, array $all = array()) {
+ $subqueries = islandora_manuscript_build_partial_query($container);
+
+ if ($container->hasAttribute('parent')) {
+ foreach ($all as $element) {
+ if ($element->getAttribute('id') == $container->getAttribute('parent')) {
+ $subqueries = array_merge(islandora_manuscript_build_subfile_query($element, $all), $subqueries);
+ }
+ }
+ }
+
+ $component = islandora_manuscript_get_container_component($container);
+ if ($component && $component->hasAttribute('id')) {
+ $subqueries[] = format_string('!field:"!value"', array(
+ '!field' => variable_get('islandora_manuscript_component_identifier_solr_field', 'dereffed_ead_component_id_ms'),
+ '!value' => $component->getAttribute('id'),
+ ));
+ }
+
+ return $subqueries;
+}
+
+/**
+ * Get the component to which the given container belongs.
+ *
+ * @param DOMElement $container
+ * A container element.
+ *
+ * @return DOMElement|bool
+ * The parent component if we could find it; otherwise, FALSE.
+ */
+function islandora_manuscript_get_container_component(DOMElement $container) {
+ $concrete_container = isset($container->parentNode) ?
+ $container :
+ islandora_manuscript_lookup_tag($container);
+
+ return $concrete_container ?
+ $concrete_container->parentNode->parentNode :
+ FALSE;
+}
+
+/**
+ * Use our "tag" ID to look up the concrete container.
+ *
+ * Certain versions of PHP provide element copies lacking references to parent
+ * elements. To work around this, we may have "tagged" each container with a
+ * attribute, which we can use to get back to the "real" element from which it
+ * was copied.
+ *
+ * @param DOMElement $container
+ * A container element to lookup.
+ *
+ * @return DOMElement|bool
+ * The container if we could find it; otherwise, FALSE.
+ *
+ * @see https://github.com/php/php-src/commit/6408a1a59e6d371cd488687e28e18815ea97984e#diff-258cc1cabc37df15d7f0ed40924f64efR283
+ */
+function islandora_manuscript_lookup_tag(DOMElement $container) {
+ $tag = $container->getAttributeNS(ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI, 'id');
+ $xpath = new DOMXPath($container->ownerDocument);
+ $xpath->registerNamespace('ead', 'urn:isbn:1-931666-22-9');
+ $xpath->registerNamespace('container-tag', ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI);
+ $results = $xpath->query("//ead:container[@container-tag:id='$tag']");
+
+ return $results->length > 0 ?
+ $results->item(0) :
+ FALSE;
+}
+
+/**
+ * Get the field for the given "type" of container.
+ *
+ * @param string $raw_type
+ * The raw type attribute value from the XML. A number of different formats
+ * have been seen in the wild, with boxes, for example:
+ * - Box
+ * - Boxes
+ * - box
+ * - boxes
+ * As a naive implementation, we lowercase and then compare at the beginning
+ * of the string for one of our recognized types, currently, just:
+ * - box
+ * - folder
+ *
+ * @return string|bool
+ * A string containing the name of a Solr field with which a query might be
+ * built, or FALSE if we do not have a mapping.
+ */
+function islandora_manuscript_findingaid_get_solr_field($raw_type) {
+ $type = strtolower($raw_type);
+ if (strpos($type, 'box') === 0) {
+ return variable_get('islandora_manuscript_box_identifier_solr_field', 'mods_relatedItem_host_part_detail_box_number_ms');
+ }
+ elseif (strpos($type, 'folder') === 0) {
+ return variable_get('islandora_manuscript_folder_identifier_solr_field', 'mods_relatedItem_host_part_detail_folder_number_ms');
+ }
+ else {
+ watchdog('islandora_manuscript', 'Unrecognized type @type.', array('@type' => $raw_type));
+ return FALSE;
+ }
+}
+
+/**
+ * Callback used in XSLT to build a query URL.
+ *
+ * @param DOMElement[] $containers
+ * An array containing a single DOMElement (this is how XSLTProcessor
+ * provides it) representing a "container" inside of an EAD document.
+ *
+ * @return string
+ * A string containing a URL to Solr search results for the given container.
+ */
+function islandora_manuscript_build_flat_query_url(array $containers) {
+ $object = menu_get_object('islandora_object', 2);
+ $parts = islandora_manuscript_build_flat_subfile_query($containers);
+ if ($object && !empty($parts)) {
+ $path = "islandora/object/{$object->id}/manuscript/manuscripts";
+ return url($path, array(
+ 'query' => array(
+ 'f' => $parts,
+ ),
+ ));
+ }
+}
+
+/**
+ * Helper function to wrap the map and merge.
+ *
+ * @param DOMElement[] $containers
+ * An array of containers at the same component level in the EAD.
+ *
+ * @return string[]
+ * An array of strings representing Lucene queries.
+ */
+function islandora_manuscript_build_flat_subfile_query(array $containers) {
+ // Array of array of Lucence queries...
+ $parts = array_map('islandora_manuscript_build_partial_query', $containers);
+
+ // Merge down to single array.
+ return empty($parts) ? array() : call_user_func_array('array_merge', $parts);
+}
diff --git a/includes/jstreebuilder.inc b/includes/jstreebuilder.inc
index fa60e80..42685dc 100644
--- a/includes/jstreebuilder.inc
+++ b/includes/jstreebuilder.inc
@@ -214,12 +214,12 @@ class ContainerListJSTreeBuilder extends JSTreeBuilder {
/**
* Inherits.
*
- * Only return results for series and subseries, and make a couple
+ * Only return results for recordgrp, subgrp, series and subseries, and make a couple
* adjustments to the data.
*/
protected function getComponentTree(DOMElement $element) {
$type = $element->getAttribute('level');
- if (in_array($type, array('series', 'subseries'))) {
+ if (in_array($type, array('recordgrp', 'subgrp', 'series', 'subseries'))) {
$to_return = parent::getComponentTree($element);
$to_return['a_attr']['href'] = url("islandora/object/{$this->object->id}", array('fragment' => $to_return['id']));
$to_return['id'] = "container_list_{$to_return['id']}";
diff --git a/includes/link.inc b/includes/link.inc
index 46d5ea8..6c9034c 100644
--- a/includes/link.inc
+++ b/includes/link.inc
@@ -210,6 +210,16 @@ function islandora_manuscript_link_to_finding_aid_form($form, &$form_state, Abst
'default' => array(
'select_node' => FALSE,
),
+ 'recordgrp' => array(
+ 'valid_children' => array(
+ 'subgrp',
+ ),
+ ),
+ 'subgrp' => array(
+ 'valid_children' => array(
+ 'series',
+ ),
+ ),
'series' => array(
'valid_children' => array(
'subseries',
diff --git a/js/findingaid.js b/js/findingaid.js
new file mode 100644
index 0000000..71e0fd7
--- /dev/null
+++ b/js/findingaid.js
@@ -0,0 +1,26 @@
+document.addEventListener('DOMContentLoaded', function () {
+ // anchor the fieldset title against the of the containing wrapper div
+ // this allows a user to permalink to an arbitrary component depth on the title
+ let wrappers = document.querySelectorAll('div.ead div.fieldset-wrapper[id]');
+ if (wrappers !== null) {
+ for (let index = 0; index < wrappers.length; ++index) {
+ let title = wrappers[index].previousSibling.querySelector('span.fieldset-legend a.fieldset-title');
+ if (title !== null) {
+ title.setAttribute('href', '#' + wrappers[index].getAttribute('id'));
+ }
+ }
+ }
+ // when clicking on a link within a fieldset, provide a reference in the browser history back to the anchor
+ // this allows a user to navigate "back" to the original position in the finding aid
+ let links = document.querySelectorAll('div.ead div.fieldset-wrapper[id] a.ead-external-link');
+ if (links !== null) {
+ for (let index = 0; index < links.length; ++index) {
+ let target = links[index].closest('div.fieldset-wrapper[id]');
+ if (target !== null) {
+ links[index].onclick = function () {
+ history.pushState({}, '', '#' + target.getAttribute('id'));
+ }
+ }
+ }
+ }
+}, false);
diff --git a/theme/islandora-manuscript-ead-display.tpl.php b/theme/islandora-manuscript-ead-display.tpl.php
index 625a33b..355a6d6 100644
--- a/theme/islandora-manuscript-ead-display.tpl.php
+++ b/theme/islandora-manuscript-ead-display.tpl.php
@@ -7,16 +7,17 @@
* - $attributes: Provided by template_process().
* - $object: An AbstractObject containing an "EAD" datastream.
* - $xslt_functions: An array of functions to allow the XSLT to run, as
- * $accepted by XSLTProcessor::registerPhpFunctions().
+ * accepted by XSLTProcessor::registerPhpFunctions().
* - $xslt_parameters: An associative array mapping namespace URIs to
- * $associative arrays of parameters proper.
+ * associative arrays of parameters proper.
* - $doc: A DOMDocument containing the parsed EAD datastream.
* - $xslt_doc: A DOMDocument containing the parsed XSLT to run.
* - $processor: The XSLTProcessor instance which was used.
* - $markup_doc: A DOMDocument containing the markup to output, after
* this function has run.
+ * - $rendered_ead_html: The rendered HTML from the $markup_doc transform
*/
?>
diff --git a/theme/theme.inc b/theme/theme.inc
index 9f29f90..38201a2 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -5,8 +5,6 @@
* Theme hooks.
*/
-define('ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI', 'http://islandora.ca/manuscript-container');
-
/**
* Implements hook_preprocess_theme().
*/
@@ -82,52 +80,18 @@ function template_preprocess_islandora_manuscript_page(array &$variables) {
* Default template: islandora-manuscript-ead-display.tpl.php
*
* @param array $variables
- * An associative array containing:
- * - object: An AbstractObject containing an "EAD" datastream.
- * - xslt_functions: An array of functions to allow the XSLT to run, as
- * accepted by XSLTProcessor::registerPhpFunctions().
- * - xslt_parameters: An associative array mapping namespace URIs to
- * associative arrays of parameters proper.
- * This function populates:
- * - doc: A DOMDocument containing the parsed EAD datastream.
- * - xslt_doc: A DOMDocument containing the parsed XSLT to run.
+ * @see islandora_manuscript_preprocess_ead_display_variables
*/
function template_preprocess_islandora_manuscript_ead_display(&$variables) {
- $variables['xslt_parameters'][''] = (isset($variables['xslt_parameters']['']) ? $variables['xslt_parameters'][''] : array()) + array(
- "container_string" => t('Containers'),
- );
- $variables['doc'] = $doc = new DOMDocument();
- $doc->loadXML($variables['object']['EAD']->content);
-
- // XXX: Need to tag containers in order to work-around a PHP bug. See
- // islandora_manuscript_lookup_tag() for more details on the bug.
- // This _could_ be wrapped in version checks, so we only tag when necessary.
- islandora_manuscript_tag_containers($doc);
-
- $variables['xslt_doc'] = $xslt_doc = new DOMDocument();
- $xslt_doc->load(drupal_get_path('module', 'islandora_manuscript') . '/transforms/ead_to_html.xslt');
+ module_load_include('inc', 'islandora_manuscript', 'includes/ead_html');
+ islandora_manuscript_preprocess_ead_display_variables($variables);
// Add JS for fieldsets.
drupal_add_js('misc/form.js');
drupal_add_js('misc/collapse.js');
-}
-
-/**
- * Tag containers with a unique ID.
- *
- * Part of a work around for a PHP bug in which nodesets passed out of XSLTs
- * are copied.
- *
- * @param DOMDocument $doc
- * A DOMDocument containing a parsed EAD document, in which we will tag all
- * containers with a document-unique attribute.
- */
-function islandora_manuscript_tag_containers(DOMDocument $doc) {
- $xpath = new DOMXPath($doc);
- $xpath->registerNamespace('ead', 'urn:isbn:1-931666-22-9');
- foreach ($xpath->query('//ead:container') as $index => $container) {
- $container->setAttributeNS(ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI, 'container-tag:id', "islandora-manuscript-container-tag:$index");
- }
+ // Add JS for finding aid.
+ $mod_path = drupal_get_path('module', 'islandora_manuscript');
+ drupal_add_js($mod_path.'/js/findingaid.js');
}
/**
@@ -136,229 +100,11 @@ function islandora_manuscript_tag_containers(DOMDocument $doc) {
* Default template: islandora-manuscript-ead-display.tpl.php
*
* @param array $variables
- * An associative array containing:
- * - object: An AbstractObject containing an "EAD" datastream.
- * - xslt_functions: An array of functions to allow the XSLT to run, as
- * accepted by XSLTProcessor::registerPhpFunctions().
- * - xslt_parameters: An associative array mapping namespace URIs to
- * associative arrays of parameters proper.
- * - doc: A DOMDocument containing the parsed EAD datastream.
- * - xslt_doc: A DOMDocument containing the parsed XSLT to run.
- * This function populates:
- * - processor: The XSLTProcessor instance which was used.
- * - markup_doc: A DOMDocument containing the markup to output, after
- * this function has run.
+ * @see islandora_manuscript_process_ead_display_variables
*/
function template_process_islandora_manuscript_ead_display(&$variables) {
- $variables['processor'] = $proc = new XSLTProcessor();
- $proc->importStylesheet($variables['xslt_doc']);
- foreach ($variables['xslt_parameters'] as $namespace_uri => $parameters) {
- $proc->setParameter($namespace_uri, $parameters);
- }
- $proc->registerPhpFunctions($variables['xslt_functions']);
- $variables['markup_doc'] = $proc->transformToDoc($variables['doc']);
+ module_load_include('inc', 'islandora_manuscript', 'includes/ead_html');
+ islandora_manuscript_process_ead_display_variables($variables);
}
-/**
- * Callback used in XSLT to build a query URL.
- *
- * @param DOMElement[] $container_array
- * An array containing a single DOMElement (this is how XSLTProcessor
- * provides it) representing a "container" inside of an EAD document.
- * @param DOMElement[] $all
- * An array containing all container elements in the given EAD document.
- *
- * @return string
- * A string containing a URL to Solr search results for the given container.
- */
-function islandora_manuscript_build_parented_query_url(array $container_array, array $all) {
- $object = menu_get_object('islandora_object', 2);
- if ($object) {
- $path = "islandora/object/{$object->id}/manuscript/manuscripts";
- list($container) = $container_array;
- return url($path, array(
- 'query' => array(
- 'f' => islandora_manuscript_build_subfile_query($container, $all),
- ),
- ));
- }
-}
-/**
- * Build a query to filter to the given container.
- *
- * @param DOMElement $container
- * A DOMElement representing the container.
- *
- * @return string[]
- * An array of strings representing Lucene queries... Likely to be used as
- * filter queries.
- */
-function islandora_manuscript_build_partial_query(DOMElement $container) {
- $subqueries = array();
- $field = islandora_manuscript_findingaid_get_solr_field($container->getAttribute('type'));
-
- $value = trim($container->nodeValue);
- if ($value != '') {
- $subqueries[] = format_string('!field:"!value"', array(
- '!field' => $field,
- '!value' => $value,
- ));
- }
-
- return $subqueries;
-}
-
-/**
- * Build a query to select all items in a given part of a file.
- *
- * @param DOMElement $container
- * An EAD container element for which to build a (part of a) query.
- * @param DOMElement[] $all
- * An array of all container elements in the EAD doc... 'Cause the "parent"
- * attribute can reference any container element.
- *
- * @return string[]
- * An array of Lucene-syntax Solr queries.
- */
-function islandora_manuscript_build_subfile_query(DOMElement $container, array $all = array()) {
- $subqueries = islandora_manuscript_build_partial_query($container);
-
- if ($container->hasAttribute('parent')) {
- foreach ($all as $element) {
- if ($element->getAttribute('id') == $container->getAttribute('parent')) {
- $subqueries = array_merge(islandora_manuscript_build_subfile_query($element, $all), $subqueries);
- }
- }
- }
-
- $component = islandora_manuscript_get_container_component($container);
- if ($component && $component->hasAttribute('id')) {
- $subqueries[] = format_string('!field:"!value"', array(
- '!field' => variable_get('islandora_manuscript_component_identifier_solr_field', 'dereffed_ead_component_id_ms'),
- '!value' => $component->getAttribute('id'),
- ));
- }
-
- return $subqueries;
-}
-
-/**
- * Get the component to which the given container belongs.
- *
- * @param DOMElement $container
- * A container element.
- *
- * @return DOMElement|bool
- * The parent component if we could find it; otherwise, FALSE.
- */
-function islandora_manuscript_get_container_component(DOMElement $container) {
- $concrete_container = isset($container->parentNode) ?
- $container :
- islandora_manuscript_lookup_tag($container);
-
- return $concrete_container ?
- $concrete_container->parentNode->parentNode :
- FALSE;
-}
-
-/**
- * Use our "tag" ID to look up the concrete container.
- *
- * Certain versions of PHP provide element copies lacking references to parent
- * elements. To work around this, we may have "tagged" each container with a
- * attribute, which we can use to get back to the "real" element from which it
- * was copied.
- *
- * @param DOMElement $container
- * A container element to lookup.
- *
- * @return DOMElement|bool
- * The container if we could find it; otherwise, FALSE.
- *
- * @see https://github.com/php/php-src/commit/6408a1a59e6d371cd488687e28e18815ea97984e#diff-258cc1cabc37df15d7f0ed40924f64efR283
- */
-function islandora_manuscript_lookup_tag(DOMElement $container) {
- $tag = $container->getAttributeNS(ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI, 'id');
- $xpath = new DOMXPath($container->ownerDocument);
- $xpath->registerNamespace('ead', 'urn:isbn:1-931666-22-9');
- $xpath->registerNamespace('container-tag', ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI);
- $results = $xpath->query("//ead:container[@container-tag:id='$tag']");
-
- return $results->length > 0 ?
- $results->item(0) :
- FALSE;
-}
-
-/**
- * Get the field for the given "type" of container.
- *
- * @param string $raw_type
- * The raw type attribute value from the XML. A number of different formats
- * have been seen in the wild, with boxes, for example:
- * - Box
- * - Boxes
- * - box
- * - boxes
- * As a naive implementation, we lowercase and then compare at the beginning
- * of the string for one of our recognized types, currently, just:
- * - box
- * - folder
- *
- * @return string|bool
- * A string containing the name of a Solr field with which a query might be
- * built, or FALSE if we do not have a mapping.
- */
-function islandora_manuscript_findingaid_get_solr_field($raw_type) {
- $type = strtolower($raw_type);
- if (strpos($type, 'box') === 0) {
- return variable_get('islandora_manuscript_box_identifier_solr_field', 'mods_relatedItem_host_part_detail_box_number_ms');
- }
- elseif (strpos($type, 'folder') === 0) {
- return variable_get('islandora_manuscript_folder_identifier_solr_field', 'mods_relatedItem_host_part_detail_folder_number_ms');
- }
- else {
- watchdog('islandora_manuscript', 'Unrecognized type @type.', array('@type' => $raw_type));
- return FALSE;
- }
-}
-
-/**
- * Callback used in XSLT to build a query URL.
- *
- * @param DOMElement[] $containers
- * An array containing a single DOMElement (this is how XSLTProcessor
- * provides it) representing a "container" inside of an EAD document.
- *
- * @return string
- * A string containing a URL to Solr search results for the given container.
- */
-function islandora_manuscript_build_flat_query_url(array $containers) {
- $object = menu_get_object('islandora_object', 2);
- $parts = islandora_manuscript_build_flat_subfile_query($containers);
- if ($object && !empty($parts)) {
- $path = "islandora/object/{$object->id}/manuscript/manuscripts";
- return url($path, array(
- 'query' => array(
- 'f' => $parts,
- ),
- ));
- }
-}
-
-/**
- * Helper function to wrap the map and merge.
- *
- * @param DOMElement[] $containers
- * An array of containers at the same component level in the EAD.
- *
- * @return string[]
- * An array of strings representing Lucene queries.
- */
-function islandora_manuscript_build_flat_subfile_query(array $containers) {
- // Array of array of Lucence queries...
- $parts = array_map('islandora_manuscript_build_partial_query', $containers);
-
- // Merge down to single array.
- return empty($parts) ? array() : call_user_func_array('array_merge', $parts);
-}
diff --git a/transforms/ead_to_html.xslt b/transforms/ead_to_html.xslt
index b1462f8..596c046 100644
--- a/transforms/ead_to_html.xslt
+++ b/transforms/ead_to_html.xslt
@@ -6,8 +6,30 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:php="http://php.net/xsl"
xsl:extension-element-prefixes="php"
+ exclude-result-prefixes="xsl ead xlink php"
>
+ Container ListContainers
+ Unit ID
+ Extent
+ Physical Location
+ Language
+ Subjects
+ Corporate Names
+ Personal Names
+ Family Names
+ Geographic Names
+ Occupations
+ Other Subjects
+ Genres
+ Record Group
+ Subgroup
+ Series
+ Subseries
+ Section
+ Subfonds
+ File
+ Item