Provide source file in metadata to transforms

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index e169fa7495a63c64340845b06a51594f1d99a71a..88644aa938cadf19ac3c9af510981b06377ab4c0 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -293,11 +293,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:apply-templates select="@*|node()"/>
                                </xslt:copy>
                        </xslt:template>
                                        <xslt:apply-templates select="@*|node()"/>
                                </xslt:copy>
                        </xslt:template>

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

                        <xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:apply" priority="1"/>
                        <xslt:template match="书社:archive" mode="书社:apply" priority="1">
                                <xslt:copy>
                        <xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:apply" priority="1"/>
                        <xslt:template match="书社:archive" mode="书社:apply" priority="1">
                                <xslt:copy>


@@ -345,53 +340,49 @@ 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="@*|node()" mode="书社:apply" priority="-1">
+                               <xslt:copy>
+                                       <xslt:apply-templates select="@*|node()" mode="书社:apply"/>
+                               </xslt:copy>
+                       </xslt:template>
+                       <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="included" select="$书社:about//*[@rdf:about=$identifier]"/>
+                               <xslt:variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
+                               <xslt:variable name="included" select="$书社:about//*[@rdf:about=$identifier or $is-dir and starts-with(@rdf:about, $identifier)]"/>

                                <xslt:choose>
                                        <xslt:when test="$included">
                                <xslt:choose>
                                        <xslt:when test="$included">

-                                               <xslt:variable name="uri">
-                                                       <xslt:text>
-                                                               <value-of select="$builddir"/>
-                                                       </xslt:text>
-                                                       <xslt:choose>
-                                                               <xslt:when test="$included/self::书社vocab:SourceFile">
-                                                                       <xslt:text>/sources/</xslt:text>
-                                                               </xslt:when>
-                                                               <xslt:when test="$included/self::书社vocab:IncludeFile">
-                                                                       <xslt:text>/includes/</xslt:text>
-                                                               </xslt:when>
-                                                       </xslt:choose>
-                                                       <xslt:value-of select="$included/@书社vocab:path"/>
-                                               </xslt:variable>
-                                               <xslt:variable name="expanded">
-                                                       <xslt:apply-templates select="document($uri)" mode="书社:expand">
-                                                               <xslt:with-param name="identifier" select="$identifier"/>
-                                                       </xslt:apply-templates>
-                                               </xslt:variable>
-                                               <xslt:for-each select="exsl:node-set($expanded)/node()">
-                                                       <xslt:copy>
-                                                               <xslt:choose>
-                                                                       <xslt:when test="self::html:*">
-                                                                               <xslt:attribute name="itemscope">itemscope</xslt:attribute>
-                                                                               <xslt:attribute name="itemtype">
-                                                                                       <xslt:text>
-                                                                                               <text>&书社;:embed</text>
-                                                                                       </xslt:text>
-                                                                                       <xslt:for-each select="exslstr:tokenize(@itemtype)/token[string()!='&书社;:document']">
+                                               <xslt:for-each select="$included">
+                                                       <xslt:sort select="@rdf:about" data-type="text" lang="zxx" case-order="upper-first"/>
+                                                       <xslt:variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
+                                                       <xslt:variable name="expanded">
+                                                               <xslt:apply-templates select="document($uri)" mode="书社:expand">
+                                                                       <xslt:with-param name="identifier" select="string(@rdf:about)"/>
+                                                               </xslt:apply-templates>
+                                                       </xslt:variable>
+                                                       <xslt:for-each select="exsl:node-set($expanded)/node()">
+                                                               <xslt:copy>
+                                                                       <xslt:choose>
+                                                                               <xslt:when test="self::html:*">
+                                                                                       <xslt:attribute name="itemscope">itemscope</xslt:attribute>
+                                                                                       <xslt:attribute name="itemtype">

                                                                                                <xslt:text>
                                                                                                <xslt:text>

-                                                                                                       <text> </text>
+                                                                                                       <text>&书社;:embed</text>

                                                                                                </xslt:text>
                                                                                                </xslt:text>

-                                                                                               <xslt:value-of select="."/>
-                                                                                       </xslt:for-each>
-                                                                               </xslt:attribute>
-                                                                               <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
-                                                                       </xslt:when>
-                                                                       <xslt:otherwise>
-                                                                               <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
-                                                                       </xslt:otherwise>
-                                                               </xslt:choose>
-                                                       </xslt:copy>
+                                                                                               <xslt:for-each select="exslstr:tokenize(@itemtype)/token[string()!='&书社;:document']">
+                                                                                                       <xslt:text>
+                                                                                                               <text> </text>
+                                                                                                       </xslt:text>
+                                                                                                       <xslt:value-of select="."/>
+                                                                                               </xslt:for-each>
+                                                                                       </xslt:attribute>
+                                                                                       <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
+                                                                               </xslt:when>
+                                                                               <xslt:otherwise>
+                                                                                       <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
+                                                                               </xslt:otherwise>
+                                                                       </xslt:choose>
+                                                               </xslt:copy>
+                                                       </xslt:for-each>

                                                </xslt:for-each>
                                        </xslt:when>
                                        <xslt:otherwise>
                                                </xslt:for-each>
                                        </xslt:when>
                                        <xslt:otherwise>


@@ -437,7 +428,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>