Provide the location of parsed files in metadata

[Shushe] / lib / expandmetadata.xslt

diff --git a/lib/expandmetadata.xslt b/lib/expandmetadata.xslt
index 3d46c82873b05e0aff27da0076c3dc5e6d673008..dd393550c5ea66416287886042cc3cda0fa6e6e6 100644 (file)
--- a/lib/expandmetadata.xslt
+++ b/lib/expandmetadata.xslt
@@ -55,17 +55,8 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <for-each select="exsl:node-set($queue)/书社:*">
                                <for-each select="$files[@rdf:about=string(current()) and nie:interpretedAs/nfo:PlainTextDocument]">
                                        <variable name="parent" select="@rdf:about"/>
                        <for-each select="exsl:node-set($queue)/书社:*">
                                <for-each select="$files[@rdf:about=string(current()) and nie:interpretedAs/nfo:PlainTextDocument]">
                                        <variable name="parent" select="@rdf:about"/>

-                                       <variable name="subdir">
-                                               <choose>
-                                                       <when test="starts-with($parent, 'about:shushe?include=')">
-                                                               <text>/includes/</text>
-                                                       </when>
-                                                       <when test="starts-with($parent, 'about:shushe?source=')">
-                                                               <text>/sources/</text>
-                                                       </when>
-                                               </choose>
-                                       </variable>
-                                       <for-each select="document(concat($builddir, $subdir, @书社vocab:path), .)//书社:link[@xlink:show='embed']">
+                                       <variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
+                                       <for-each select="document($uri)//书社:link[@xlink:show='embed']">

                                                <if test="exsl:node-set($old)/书社:dependency-root[string()=string(current()/@xlink:href)]">
                                                        <书社:recursive-dependency>
                                                                <value-of select="$parent"/>
                                                <if test="exsl:node-set($old)/书社:dependency-root[string()=string(current()/@xlink:href)]">
                                                        <书社:recursive-dependency>
                                                                <value-of select="$parent"/>


@@ -106,7 +97,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                </copy>
        </template>
        <template match="//书社vocab:SourceFile[nie:interpretedAs/nfo:PlainTextDocument]" priority="1">
                </copy>
        </template>
        <template match="//书社vocab:SourceFile[nie:interpretedAs/nfo:PlainTextDocument]" priority="1">

-               <variable name="parsed" select="document(concat($builddir, '/sources/', @书社vocab:path), .)"/>
+               <variable name="parsed" select="document(书社vocab:hasParsedFile/@nfo:fileUrl)"/>

                <variable name="destination-delim" select="concat('/', $parsed/*/@书社:destination, '/')"/>
                <variable name="destination">
                        <choose>
                <variable name="destination-delim" select="concat('/', $parsed/*/@书社:destination, '/')"/>
                <variable name="destination">
                        <choose>