Changeset 34313 for main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl

Timestamp:

2020-08-06T16:04:04+12:00 (4 years ago)

Author:

ak19

Message:

Correcting XSL to not add classifiers that are empty.

File:

• main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl (modified) (3 diffs)

main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl

@@ -121 +121 @@
 <xsl:template name="navBar">
 <xsl:choose>
-<xsl:when test="page/pageResponse/collection">
-<xsl:variable name="count" select="count(/page/pageResponse/collection/serviceList/service[@name='ClassifierBrowse']/classifierList/classifier)"/>
-<xsl:variable name="currentPage" select="page/pageRequest/@fullURL"/>
+  <xsl:when test="page/pageResponse/collection">
+    <!-- Using select statement to count only non-empty elements, is harder than testing
+         for non-empty elements. Solution of using normalize-space() is from
+         https://stackoverflow.com/questions/31602369/xsl-return-only-the-first-non-empty-element
+    -->
+    <xsl:variable name="count" select="count(/page/pageResponse/collection/serviceList/service[@name='ClassifierBrowse']/classifierList/classifier/displayItem[@name = 'name'][normalize-space()])"/>
+    <xsl:variable name="currentPage" select="page/pageRequest/@fullURL"/>
 
 <li><a href="{$library_name}">DL Home</a></li>
@@ -162 +166 @@
 
 <xsl:template name="Browsing">
-    <xsl:for-each select="/page/pageResponse/collection/serviceList/service[@name='ClassifierBrowse']/classifierList/classifier">
+  <xsl:for-each select="/page/pageResponse/collection/serviceList/service[@name='ClassifierBrowse']/classifierList/classifier">
+    <xsl:choose>
+      <!-- Only display browsing classifiers that have a name.
+           Those that don't have a name are empty classifiers
+           denoted by no value/empty value for displayItem name=name elements.
+           Testing for non empty elements is easy: not() test. -->
+      <xsl:when test="not(displayItem[@name='name'] ='')">
         <li>
             <xsl:choose>
@@ -191 +201 @@
             </a>
         </li>
+          </xsl:when>
+           </xsl:choose>
     </xsl:for-each>
 </xsl:template>