Merge remote branch 'uls/headings' into uls-install

Conflicts: includes/ead_html.inc transforms/ead_to_html.xslt
ulsdevteam · Nov 8, 2021 · 1084ce0 · 1084ce0
2 parents 0746b49 + e3e085e
commit 1084ce0
Show file tree

Hide file tree

Showing 6 changed files with 440 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ 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:
+* `subgrp`
 * `series`
 * `subseries`
 * `file`

diff --git 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
@@ -23,7 +23,27 @@ define('ISLANDORA_MANUSCRIPT_CONTAINER_TAG_URI', 'http://islandora.ca/manuscript
  */
 function islandora_manuscript_preprocess_ead_display_variables(&$variables) {
   $variables['xslt_parameters'][''] = (isset($variables['xslt_parameters']['']) ? $variables['xslt_parameters'][''] : array()) + array(
+    "containerlist_string" => 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'),
+    "subfonds" => t('Subfonds'),
+    "file_string" => t('File'),
+    "item_string" => t('Item'),
   );
   $variables['xslt_parameters']['']['call_query_link'] = variable_get('islandora_manuscript_query_enable', true) ? 'true' : 'false';
   $variables['xslt_parameters']['']['call_direct_link'] = variable_get('islandora_manuscript_direct_enable', false) ? 'true' : false;

diff --git 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
@@ -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',