Fix generator metadata

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 3fb4c33172c5152f873f9f2e2745bd6d39d6b271..c0e989b60e4ecd48d1253d53a2c44c9c2e8aee15 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -58,30 +58,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </xslt:otherwise>
                                </xslt:choose>
                        </xslt:variable>
-                       <xslt:variable name="书社:pagedestination">
-                               <xslt:variable name="dir">
-                                       <xslt:for-each select="exslstr:tokenize($书社:destination, '/')[not(position()=last())]">
-                                               <xslt:value-of select="."/>
-                                               <xslt:text>/</xslt:text>
-                                       </xslt:for-each>
-                               </xslt:variable>
-                               <xslt:variable name="name" select="string(exslstr:tokenize($书社:destination, '/')[last()])"/>
-                               <xslt:value-of select="$dir"/>
-                               <xslt:choose>
-                                       <xslt:when test="contains($name, '%s')">
-                                               <xslt:value-of select="$name"/>
-                                       </xslt:when>
-                                       <xslt:when test="contains($name, '.')">
-                                               <xslt:value-of select="substring-before($name, '.')"/>
-                                               <xslt:text>%s.</xslt:text>
-                                               <xslt:value-of select="substring-after($name, '.')"/>
-                                       </xslt:when>
-                                       <xslt:otherwise>
-                                               <xslt:value-of select="$name"/>
-                                               <xslt:text>%s</xslt:text>
-                                       </xslt:otherwise>
-                               </xslt:choose>
-                       </xslt:variable>
                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">
                                        <if test="contains(@name, ':')">
@@ -202,14 +178,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </xslt:template>
                        <xslt:template name="书社:wrap">
                                <xslt:param name="nodes" select="/.."/>
-                               <xslt:variable name="modalinput">
+                               <xslt:variable name="modalinput-fragment">
                                        <xslt:copy-of select="$nodes"/>
                                        <xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
                                </xslt:variable>
-                               <xslt:variable name="metadata">
+                               <xslt:variable name="modalinput" select="exsl:node-set($modalinput-fragment)"/>
+                               <xslt:variable name="metadata-fragment">
                                        <xslt:copy-of select="$nodes[self::html:html]/html:head/node()|$nodes[self::html:head]/node()"/>
-                                       <xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:metadata"/>
+                                       <xslt:apply-templates select="$modalinput/node()" mode="书社:metadata"/>
                                </xslt:variable>
+                               <xslt:variable name="metadata" select="exsl:node-set($metadata-fragment)"/>
                                <html:html>
                                        <xslt:copy-of select="$nodes[self::html:html]/@*"/>
                                        <xslt:if test="not($nodes[self::html:html]/@书社:archived-as) and $nodes/@书社:archived-as">
@@ -230,7 +208,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <html:head>
                                                <xslt:copy-of select="$nodes[self::html:html]/html:head/@*|$nodes[self::html:head]/@*"/>
                                                <html:title>
-                                                       <xslt:for-each select="exsl:node-set($metadata)/html:title">
+                                                       <xslt:for-each select="$metadata/html:title">
                                                                <xslt:value-of select="."/>
                                                                <xslt:if test="position()!=last()">
                                                                        <xslt:text>
@@ -239,10 +217,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </xslt:if>
                                                        </xslt:for-each>
                                                </html:title>
-                                               <xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::html:title)]"/>
+                                               <xslt:copy-of select="$metadata/node()[not(self::html:title or self::html:meta and @name='generator')]"/>
                                                <html:meta name="generator">
                                                        <xslt:attribute name="content">
-                                                               <xslt:for-each select="exsl:node-set($metadata)/html:meta[@name='generator']">
+                                                               <xslt:for-each select="$metadata/html:meta[@name='generator']">
                                                                        <xslt:value-of select="@content"/>
                                                                        <xslt:text>
                                                                                <text>, </text>
@@ -265,9 +243,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </html:head>
                                        <html:body>
                                                <xslt:copy-of select="$nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*"/>
-                                               <xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:header"/>
+                                               <xslt:apply-templates select="$modalinput/node()" mode="书社:header"/>
                                                <xslt:copy-of select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()"/>
-                                               <xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:footer"/>
+                                               <xslt:apply-templates select="$modalinput/node()" mode="书社:footer"/>
                                        </html:body>
                                </html:html>
                        </xslt:template>
@@ -308,33 +286,17 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:apply-templates select="@*|node()" mode="书社:application"/>
                                </xslt:copy>
                        </xslt:template>
-                       <xslt:template match="@书社:destination[not(../self::书社:page)]|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:application" priority="1"/>
-                       <xslt:template match="书社:archive|书社:page" mode="书社:application" priority="1">
+                       <xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:application" priority="1"/>
+                       <xslt:template match="书社:archive" mode="书社:application" priority="1">
                                <xslt:copy>
                                        <xslt:for-each select="@*">
                                                <xslt:choose>
-                                                       <xslt:when test="../self::书社:archive and local-name()='archived-as' and namespace-uri()='&书社;' and ../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]"/>
+                                                       <xslt:when test="local-name()='archived-as' and namespace-uri()='&书社;' and ../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]"/>
                                                        <xslt:otherwise>
                                                                <xslt:apply-templates select="." mode="书社:application"/>
                                                        </xslt:otherwise>
                                                </xslt:choose>
                                        </xslt:for-each>
-                                       <xslt:if test="self::书社:page and not(@书社:destination)">
-                                               <xslt:attribute name="书社:destination">
-                                                       <xslt:value-of select="substring-before($书社:pagedestination, '%s')"/>
-                                                       <xslt:text>%22%7B</xslt:text>
-                                                       <xslt:choose>
-                                                               <xslt:when test="@name">
-                                                                       <xslt:value-of select="@name"/>
-                                                               </xslt:when>
-                                                               <xslt:otherwise>
-                                                                       <xslt:value-of select="count(ancestor::书社:page|preceding::书社:page)+1"/>
-                                                               </xslt:otherwise>
-                                                       </xslt:choose>
-                                                       <xslt:text>%7D%22</xslt:text>
-                                                       <xslt:value-of select="substring-after($书社:pagedestination, '%s')"/>
-                                               </xslt:attribute>
-                                       </xslt:if>
                                        <xslt:for-each select="node()">
                                                <xslt:choose>
                                                        <xslt:when test="self::*">