Merge pull request #6 from /issues/5-add_support_for_relatedItem_type…

…_series #5 - added support for relatedItem/@type='series'
MyCoRe-Org · Aug 27, 2019 · 9e89b75 · 9e89b75
2 parents ea50505 + cc49499
commit 9e89b75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/resources/config/mir-navigation-plugin/solr/main/solr-schema.json b/src/main/resources/config/mir-navigation-plugin/solr/main/solr-schema.json
@@ -4,6 +4,6 @@
 		"type": "string",
 		"indexed": true,
 		"stored": true,
-		"multiValued": false
+		"multiValued": true
 	}
 }
diff --git a/src/main/resources/xsl/duepublico-series-layout.xsl b/src/main/resources/xsl/duepublico-series-layout.xsl
@@ -18,8 +18,8 @@
   <xsl:template match="/">
     <xsl:for-each select="/mycoreobject">
       <xsl:choose>
-        <xsl:when test="metadata/def.modsContainer/modsContainer/mods:mods/mods:relatedItem[@type='host']">
-          <xsl:apply-templates select="metadata/def.modsContainer/modsContainer/mods:mods/mods:relatedItem[@type='host']" mode="seriesLayout" />
+        <xsl:when test="metadata/def.modsContainer/modsContainer/mods:mods/mods:relatedItem[contains('host series',@type)]">
+          <xsl:apply-templates select="metadata/def.modsContainer/modsContainer/mods:mods/mods:relatedItem[contains('host series',@type)]" mode="seriesLayout" />
         </xsl:when>
         <xsl:otherwise>
           <xsl:apply-templates select="." mode="seriesLayout" />
@@ -29,10 +29,10 @@
     <xsl:apply-imports />
   </xsl:template>
 
-  <xsl:template match="mods:relatedItem[@type='host'][@xlink:href]" mode="seriesLayout">
+  <xsl:template match="mods:relatedItem[contains('host series',@type)][@xlink:href]" mode="seriesLayout">
     <xsl:choose>
-      <xsl:when test="mods:relatedItem[@type='host'][@xlink:href]">
-        <xsl:apply-templates select="mods:relatedItem[@type='host'][@xlink:href]" mode="seriesLayout" />
+      <xsl:when test="mods:relatedItem[contains('host series',@type)][@xlink:href]">
+        <xsl:apply-templates select="mods:relatedItem[contains('host series',@type)][@xlink:href]" mode="seriesLayout" />
       </xsl:when>
       <xsl:otherwise>
         <xsl:apply-templates select="document(concat('notnull:mcrobject:',@xlink:href))/mycoreobject" mode="seriesLayout" />

diff --git a/src/main/resources/xsl/solr-navigation.xsl b/src/main/resources/xsl/solr-navigation.xsl
@@ -10,14 +10,14 @@
 
   <xsl:template match="mycoreobject">
     <xsl:apply-imports />
-    <xsl:apply-templates select="metadata/def.modsContainer/modsContainer/mods:mods/mods:relatedItem[@type='host'][@xlink:href]" mode="rootID" />
+    <xsl:apply-templates select="metadata/def.modsContainer/modsContainer/mods:mods/mods:relatedItem[contains('host series',@type)][@xlink:href]" mode="rootID" />
   </xsl:template>
 
   <!-- go up all the ancestors to find ID of root object that has no parent (root of series/journal) -->
-  <xsl:template match="mods:relatedItem[@type='host'][@xlink:href]" mode="rootID">
+  <xsl:template match="mods:relatedItem[contains('host series',@type)][@xlink:href]" mode="rootID">
     <xsl:choose>
-      <xsl:when test="mods:relatedItem[@type='host'][@xlink:href]">
-        <xsl:apply-templates select="mods:relatedItem[@type='host'][@xlink:href]" mode="rootID" />
+      <xsl:when test="mods:relatedItem[contains('host series',@type)][@xlink:href]">
+        <xsl:apply-templates select="mods:relatedItem[contains('host series',@type)][@xlink:href]" mode="rootID" />
       </xsl:when>
       <xsl:otherwise>
         <field name="root">