From ade4d9863ad0bd9fdffe1fc00667e58728cc73e4 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Tue, 19 Jan 2016 13:34:03 -0800
Subject: [PATCH] Fixed disk processing for manifest XML files

---
 docs/pcjs/demos/components.xsl        | 4 ++--
 modules/pcjs/templates/components.xsl | 4 ++--
 versions/pcjs/1.20.4/components.xsl   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/pcjs/demos/components.xsl b/docs/pcjs/demos/components.xsl
index 0630c03bb..eab8496e7 100644
--- a/docs/pcjs/demos/components.xsl
+++ b/docs/pcjs/demos/components.xsl
@@ -462,12 +462,12 @@
 	</xsl:template>
 
 	<xsl:template match="manifest[not(@ref)]" mode="component">
-		<xsl:param name="disk"><xsl:if test="@disk"><xsl:value-of select="@disk"/></xsl:if><xsl:if test="not(@disk)">*</xsl:if></xsl:param>
+		<xsl:param name="disk" select="''"/>
 		<xsl:variable name="prefix">
 			<xsl:if test="title/@prefix"><xsl:value-of select="title/@prefix"/><xsl:text>: </xsl:text></xsl:if>
 		</xsl:variable>
 		<xsl:for-each select="disk">
-			<xsl:if test="$disk = @id or $disk = '*'">
+			<xsl:if test="$disk = @id or $disk = '*' or $disk = ''">
 				<xsl:variable name="name">
 					<xsl:choose>
 						<xsl:when test="name"><xsl:value-of select="$prefix"/><xsl:value-of select="name"/></xsl:when>
diff --git a/modules/pcjs/templates/components.xsl b/modules/pcjs/templates/components.xsl
index 01a25471d..bee9e5f05 100644
--- a/modules/pcjs/templates/components.xsl
+++ b/modules/pcjs/templates/components.xsl
@@ -463,12 +463,12 @@
 	</xsl:template>
 
 	<xsl:template match="manifest[not(@ref)]" mode="component">
-		<xsl:param name="disk"><xsl:if test="@disk"><xsl:value-of select="@disk"/></xsl:if><xsl:if test="not(@disk)">*</xsl:if></xsl:param>
+		<xsl:param name="disk" select="''"/>
 		<xsl:variable name="prefix">
 			<xsl:if test="title/@prefix"><xsl:value-of select="title/@prefix"/><xsl:text>: </xsl:text></xsl:if>
 		</xsl:variable>
 		<xsl:for-each select="disk">
-			<xsl:if test="$disk = @id or $disk = '*'">
+			<xsl:if test="$disk = @id or $disk = '*' or $disk = ''">
 				<xsl:variable name="name">
 					<xsl:choose>
 						<xsl:when test="name"><xsl:value-of select="$prefix"/><xsl:value-of select="name"/></xsl:when>
diff --git a/versions/pcjs/1.20.4/components.xsl b/versions/pcjs/1.20.4/components.xsl
index 8ef937e81..3738f0cd6 100644
--- a/versions/pcjs/1.20.4/components.xsl
+++ b/versions/pcjs/1.20.4/components.xsl
@@ -462,12 +462,12 @@
 	</xsl:template>
 
 	<xsl:template match="manifest[not(@ref)]" mode="component">
-		<xsl:param name="disk"><xsl:if test="@disk"><xsl:value-of select="@disk"/></xsl:if><xsl:if test="not(@disk)">*</xsl:if></xsl:param>
+		<xsl:param name="disk" select="''"/>
 		<xsl:variable name="prefix">
 			<xsl:if test="title/@prefix"><xsl:value-of select="title/@prefix"/><xsl:text>: </xsl:text></xsl:if>
 		</xsl:variable>
 		<xsl:for-each select="disk">
-			<xsl:if test="$disk = @id or $disk = '*'">
+			<xsl:if test="$disk = @id or $disk = '*' or $disk = ''">
 				<xsl:variable name="name">
 					<xsl:choose>
 						<xsl:when test="name"><xsl:value-of select="$prefix"/><xsl:value-of select="name"/></xsl:when>