X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/225d2e9c3d8c3abe4816c97206dae0955ace5f44..bc1b63801488992c309f0b8bd1d5a772b7e5645e:/lib/expandmetadata.xslt

diff --git a/lib/expandmetadata.xslt b/lib/expandmetadata.xslt
index 3d46c82..2501355 100644
--- a/lib/expandmetadata.xslt
+++ b/lib/expandmetadata.xslt
@@ -55,33 +55,31 @@ 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"/>
-					<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']">
-						<if test="exsl:node-set($old)/书社:dependency-root[string()=string(current()/@xlink:href)]">
-							<书社:recursive-dependency>
-								<value-of select="$parent"/>
-							</书社:recursive-dependency>
-						</if>
-						<if test="$files/@rdf:about[string()=string(current()/@xlink:href)]">
-							<书社:dependency>
-								<value-of select="@xlink:href"/>
-							</书社:dependency>
-						</if>
+					<variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
+					<for-each select="document($uri)//书社:link[@xlink:show='embed']">
+						<variable name="identifier" select="string(current()/@xlink:href)"/>
+						<variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
+						<for-each select="$files/@rdf:about[string(.)=$identifier or $is-dir and starts-with(., $identifier)]">
+							<sort select="." data-type="text" lang="zxx" case-order="upper-first"/>
+							<choose>
+								<when test="exsl:node-set($old)/书社:dependency-root[string()=string(current())]">
+									<书社:recursive-dependency>
+										<value-of select="$parent"/>
+									</书社:recursive-dependency>
+								</when>
+								<otherwise>
+									<书社:dependency>
+										<value-of select="."/>
+									</书社:dependency>
+								</otherwise>
+							</choose>
+						</for-each>
 					</for-each>
 				</for-each>
 			</for-each>
 		</variable>
 		<choose>
-			<when test="exsl:node-set($new)/书社:dependency">
+			<when test="exsl:node-set($new)/*">
 				<call-template name="书社:process-dependencies">
 					<with-param name="processed">
 						<copy-of select="$old"/>
@@ -106,7 +104,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">
-		<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>