Disallow @xlink:actuate values other than none

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index af7fd6fc87e25bc787b0fbb27743b409c4338dc8..6c952e045939ef9dc96c849c48373a053ac33785 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -17,7 +17,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 ]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
 ]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"

-       xmlns:dct="http://purl.org/dc/terms/"

        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"


@@ -29,22 +28,39 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"

+       xmlns:书社vocab="urn:fdc:ladys.computer:20231231:Shu1She4:vocab:"

        exclude-result-prefixes="catalog"
        version="1.0"
 >
        <include href="literally.xslt"/>
        <namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
        <param name="METADATA" select="'about:blank'"/>
        exclude-result-prefixes="catalog"
        version="1.0"
 >
        <include href="literally.xslt"/>
        <namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
        <param name="METADATA" select="'about:blank'"/>

+       <variable name="builddir" select="document($METADATA)//书社vocab:BuildDirectory/@nfo:fileUrl"/>

        <template match="/">
        <template match="/">

+               <variable name="ids">
+                       <for-each select="//catalog:uri[@name]">
+                               <书社:id>
+                                       <value-of select="@name"/>
+                               </书社:id>
+                       </for-each>
+               </variable>
+               <variable name="unique-ids">
+                       <for-each select="exsl:node-set($ids)/*">
+                               <if test="not(preceding-sibling::*[string(.)=string(current())])">
+                                       <copy-of select="."/>
+                               </if>
+                       </for-each>
+               </variable>

                <xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="exsl exslstr" version="1.0">
                        <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
                        <xslt:param name="IDENTIFIER" select="false()"/>
                <xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="exsl exslstr" version="1.0">
                        <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
                        <xslt:param name="IDENTIFIER" select="false()"/>

-                       <xslt:param name="PATH" select="'/unknown'"/>

                        <xslt:param name="SRCREV" select="false()"/>
                        <xslt:param name="THISREV" select="false()"/>
                        <xslt:variable name="书社:source" select="/"/>
                        <xslt:variable name="书社:about-fragment">
                        <xslt:param name="SRCREV" select="false()"/>
                        <xslt:param name="THISREV" select="false()"/>
                        <xslt:variable name="书社:source" select="/"/>
                        <xslt:variable name="书社:about-fragment">

-                               <apply-templates select="document($METADATA)" mode="书社:literally"/>
+                               <apply-templates select="document($METADATA)" mode="书社:literally">
+                                       <with-param name="extension-element-namespaces" select="'http://exslt.org/common http://exslt.org/strings'"/>
+                               </apply-templates>

                        </xslt:variable>
                        <xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
                        <xslt:variable name="书社:expansion-fragment">
                        </xslt:variable>
                        <xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
                        <xslt:variable name="书社:expansion-fragment">


@@ -55,26 +71,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <xslt:apply-templates select="$书社:expansion/node()"/>
                        </xslt:variable>
                        <xslt:variable name="书社:result" select="exsl:node-set($书社:result-fragment)"/>
                                <xslt:apply-templates select="$书社:expansion/node()"/>
                        </xslt:variable>
                        <xslt:variable name="书社:result" select="exsl:node-set($书社:result-fragment)"/>

-                       <xslt:variable name="书社:destination">
-                               <xslt:choose>
-                                       <xslt:when test="string($书社:source/@书社:destination)!=''">
-                                               <xslt:value-of select="$书社:source/@书社:destination"/>
-                                       </xslt:when>
-                                       <xslt:when test="starts-with($PATH, '/')">
-                                               <xslt:value-of select="substring-after($PATH, '/')"/>
-                                       </xslt:when>
-                                       <xslt:otherwise>
-                                               <xslt:value-of select="$PATH"/>
-                                       </xslt:otherwise>
-                               </xslt:choose>
-                       </xslt:variable>
+                       <xslt:variable name="书社:destination" select="string($书社:about//*[@rdf:about=$IDENTIFIER]/@书社vocab:destination)"/>

                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">
                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">

-                                       <if test="contains(@name, ':')">
-                                               <attribute name="书社:id">
-                                                       <value-of select="@name"/>
-                                               </attribute>
-                                       </if>
+                                       <attribute name="书社:id">
+                                               <value-of select="@name"/>
+                                       </attribute>

                                </xslt:include>
                        </for-each>
                        <xslt:template name="书社:apply-attributes">
                                </xslt:include>
                        </for-each>
                        <xslt:template name="书社:apply-attributes">


@@ -190,7 +192,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <xslt:param name="nodes" select="/.."/>
                                <xslt:variable name="modalinput-fragment">
                                        <xslt:copy-of select="$nodes"/>
                                <xslt:param name="nodes" select="/.."/>
                                <xslt:variable name="modalinput-fragment">
                                        <xslt:copy-of select="$nodes"/>

-                                       <xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
+                                       <apply-templates select="exsl:node-set($unique-ids)" mode="书社:literally"/>

                                </xslt:variable>
                                <xslt:variable name="modalinput" select="exsl:node-set($modalinput-fragment)"/>
                                <xslt:variable name="metadata-fragment">
                                </xslt:variable>
                                <xslt:variable name="modalinput" select="exsl:node-set($modalinput-fragment)"/>
                                <xslt:variable name="metadata-fragment">


@@ -263,7 +265,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <xslt:variable name="result-nodes" select="$书社:result/node()[not(self::书社:apply-attributes-to-root)]|$书社:result/书社:apply-attributes-to-root/descendant::node()[not(self::书社:apply-attributes-to-root) and not(ancestor::*[not(self::书社:apply-attributes-to-root)])]"/>
                                <xslt:variable name="root-with-attributes">
                                        <xslt:choose>
                                <xslt:variable name="result-nodes" select="$书社:result/node()[not(self::书社:apply-attributes-to-root)]|$书社:result/书社:apply-attributes-to-root/descendant::node()[not(self::书社:apply-attributes-to-root) and not(ancestor::*[not(self::书社:apply-attributes-to-root)])]"/>
                                <xslt:variable name="root-with-attributes">
                                        <xslt:choose>

-                                               <xslt:when test="$result-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive']|$result-nodes/@书社:disable-output-wrapping|$书社:result//书社:apply-attributes-to-root/@书社:disable-output-wrapping">
+                                               <xslt:when test="not($result-nodes/self::html:*) or $result-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive'] or $result-nodes/@书社:disable-output-wrapping or $书社:result//书社:apply-attributes-to-root/@书社:disable-output-wrapping">

                                                        <xslt:call-template name="书社:apply-attributes">
                                                                <xslt:with-param name="and-version" select="true()"/>
                                                                <xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>
                                                        <xslt:call-template name="书社:apply-attributes">
                                                                <xslt:with-param name="and-version" select="true()"/>
                                                                <xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>


@@ -343,11 +345,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <xslt:template match="书社:apply-attributes-to-root" mode="书社:apply" priority="1">
                                <xslt:apply-templates mode="书社:apply"/>
                        </xslt:template>
                        <xslt:template match="书社:apply-attributes-to-root" mode="书社:apply" priority="1">
                                <xslt:apply-templates mode="书社:apply"/>
                        </xslt:template>

-                       <xslt:template match="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
+                       <xslt:template match="书社:link[@xlink:show='embed' and (not(@xlink:actuate) or @xlink:actuate='none')]" mode="书社:expand" priority="1">

                                <xslt:variable name="identifier" select="string(@xlink:href)"/>
                                <xslt:variable name="identifier" select="string(@xlink:href)"/>

-                               <xslt:variable name="uri" select="document($METADATA)//*[@rdf:about=$identifier]/dct:hasFormat/*[nie:interpretedAs/*[@nie:mimeType='application/xml']]/@nfo:fileUrl[1]"/>
+                               <xslt:variable name="included" select="$书社:about//*[@rdf:about=$identifier]"/>

                                <xslt:choose>
                                <xslt:choose>

-                                       <xslt:when test="$uri">
+                                       <xslt:when test="$included">
+                                               <xslt:variable name="uri" select="$included/书社vocab:hasParsedFile/@nfo:fileUrl"/>

                                                <xslt:variable name="expanded">
                                                        <xslt:apply-templates select="document($uri)" mode="书社:expand">
                                                                <xslt:with-param name="identifier" select="$identifier"/>
                                                <xslt:variable name="expanded">
                                                        <xslt:apply-templates select="document($uri)" mode="书社:expand">
                                                                <xslt:with-param name="identifier" select="$identifier"/>


@@ -421,7 +424,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </xslt:choose>
                                </xslt:copy>
                        </xslt:template>
                                        </xslt:choose>
                                </xslt:copy>
                        </xslt:template>

-                       <xslt:template match="@*|node()[not(self::书社:link) or not(@xlink:show='embed')]" mode="书社:expand" priority="-1">
+                       <xslt:template match="@*|node()" mode="书社:expand" priority="-1">

                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
                                </xslt:copy>
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
                                </xslt:copy>