Correct syntax for X·Path booleans

[Shushe] / lib / catalog2parser.xslt

diff --git a/lib/catalog2parser.xslt b/lib/catalog2parser.xslt
index eb35e803d24da0ba21a793f5177facab2713bc9a..a834d15f6052485d1827ed2171e04f5e67c5d10f 100644 (file)
--- a/lib/catalog2parser.xslt
+++ b/lib/catalog2parser.xslt
@@ -23,11 +23,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        <template match="/">
                <xslt:transform version="1.0">
                        <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
-                       <xslt:param name="CKSUM" select="false"/>
-                       <xslt:param name="GENERATOR" select="false"/>
-                       <xslt:param name="SRCREV" select="false"/>
+                       <xslt:param name="CKSUM" select="false()"/>
+                       <xslt:param name="IDENTIFIER" select="false()"/>
+                       <xslt:param name="SRCREV" select="false()"/>
                        <xslt:param name="SRCTIME" select="'1972-12-31T00:00:00Z'"/>
-                       <xslt:param name="VERSION" select="false"/>
+                       <xslt:param name="THISREV" select="false()"/>
                        <xslt:variable name="书社:parsers">
                                <html:dl>
                                        <for-each select="//catalog:uri">
@@ -85,22 +85,56 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </for-each>
                        <xslt:template name="书社:apply-parsed-by">
                                <xslt:param name="id"/>
+                               <xslt:param name="media-type"/>
                                <xslt:param name="result" select="/.."/>
                                <xslt:for-each select="$result/node()">
-                                       <xslt:copy>
-                                               <xslt:attribute name="书社:parsed-by">
-                                                       <xslt:value-of select="$id"/>
-                                                       <xslt:if test="@书社:parsed-by">
-                                                               <xslt:text> </xslt:text>
-                                                               <xslt:value-of select="@书社:parsed-by"/>
-                                                       </xslt:if>
-                                               </xslt:attribute>
-                                               <xslt:copy-of select="@*[not(namespace-uri()='urn:fdc:ladys.computer:20231231:Shu1She4' and local-name()='parsed-by')]|node()"/>
-                                       </xslt:copy>
+                                       <xslt:choose>
+                                               <xslt:when test="self::*">
+                                                       <xslt:copy>
+                                                               <xslt:if test="string($id)!=''">
+                                                                       <xslt:attribute name="书社:parsed-by">
+                                                                               <xslt:value-of select="$id"/>
+                                                                               <xslt:if test="@书社:parsed-by">
+                                                                                       <xslt:text>
+                                                                                               <text> </text>
+                                                                                       </xslt:text>
+                                                                                       <xslt:value-of select="@书社:parsed-by"/>
+                                                                               </xslt:if>
+                                                                       </xslt:attribute>
+                                                               </xslt:if>
+                                                               <xslt:if test="string($media-type)!=''">
+                                                                       <xslt:attribute name="书社:media-type">
+                                                                               <xslt:value-of select="$media-type"/>
+                                                                       </xslt:attribute>
+                                                               </xslt:if>
+                                                               <xslt:copy-of select="@*[namespace-uri()!='urn:fdc:ladys.computer:20231231:Shu1She4' or local-name()!='parsed-by' and local-name()!='media-type']|node()"/>
+                                                       </xslt:copy>
+                                               </xslt:when>
+                                               <xslt:otherwise>
+                                                       <xslt:copy-of select="."/>
+                                               </xslt:otherwise>
+                                       </xslt:choose>
                                </xslt:for-each>
                        </xslt:template>
                        <xslt:template match="/">
-                               <xslt:apply-templates select="node()" mode="书社:parse"/>
+                               <xslt:variable name="parsedroot">
+                                       <xslt:apply-templates select="node()" mode="书社:parse"/>
+                               </xslt:variable>
+                               <xslt:for-each select="exsl:node-set($parsedroot)/node()">
+                                       <xslt:choose>
+                                               <xslt:when test="self::*">
+                                                       <xslt:copy>
+                                                               <xslt:attribute name="书社:cksum">
+                                                                       <xslt:value-of select="$CKSUM"/>
+                                                               </xslt:attribute>
+                                                               <xslt:copy-of select="@*|node()"/>
+                                                       </xslt:copy>
+                                               </xslt:when>
+                                               <xslt:otherwise>
+                                                       <xslt:copy-of select="."/>
+                                               </xslt:otherwise>
+                                       </xslt:choose>
+                               </xslt:for-each>
                        </xslt:template>
                        <xslt:template match="@*|node()" priority="-1">
                                <xslt:copy>
@@ -118,7 +152,8 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                        <xslt:apply-templates select="exsl:node-set($result)/node()" mode="书社:parse"/>
                                                </xslt:variable>
                                                <xslt:call-template name="书社:apply-parsed-by">
-                                                       <xslt:with-param name="id" select="$parserdiv/html:dt"/>
+                                                       <xslt:with-param name="id" select="string($parserdiv/html:dt)"/>
+                                                       <xslt:with-param name="media-type" select="string(@type)"/>
                                                        <xslt:with-param name="result" select="exsl:node-set($reparsed-result)"/>
                                                </xslt:call-template>
                                        </xslt:when>