Allow including entire directories

[Shushe] / lib / expandmetadata.xslt

diff --git a/lib/expandmetadata.xslt b/lib/expandmetadata.xslt
index dd393550c5ea66416287886042cc3cda0fa6e6e6..2501355ef5bca2b455b569d8736c0e8acb0de6eb 100644 (file)
--- 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']">
                                        <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>
                                        </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"/>
                                <call-template name="书社:process-dependencies">
                                        <with-param name="processed">
                                                <copy-of select="$old"/>