X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/f3c2056c026b2d04d1470d000c50df85759b6003..bc1b63801488992c309f0b8bd1d5a772b7e5645e:/lib/expandmetadata.xslt?ds=sidebyside

diff --git a/lib/expandmetadata.xslt b/lib/expandmetadata.xslt
index dd39355..2501355 100644
--- a/lib/expandmetadata.xslt
+++ b/lib/expandmetadata.xslt
@@ -57,22 +57,29 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					<variable name="parent" select="@rdf:about"/>
 					<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"/>
-							</书社:recursive-dependency>
-						</if>
-						<if test="$files/@rdf:about[string()=string(current()/@xlink:href)]">
-							<书社:dependency>
-								<value-of select="@xlink:href"/>
-							</书社:dependency>
-						</if>
+						<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"/>