Move includes above result variables

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index ce94067fa445d9b88b3fd63ba1f37836d62c40e4..b2cd23601ef34cd12deadcc3d5dadda2de718c90 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -86,6 +86,13 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </apply-templates>
                        </xslt:variable>
                        <xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
+                       <for-each select="//catalog:uri">
+                               <xslt:include href="{@uri}">
+                                       <attribute name="书社:id">
+                                               <value-of select="@name"/>
+                                       </attribute>
+                               </xslt:include>
+                       </for-each>
                        <xslt:variable name="书社:expansion-fragment">
                                <xslt:apply-templates select="$书社:source/node()" mode="书社:expand"/>
                        </xslt:variable>
@@ -100,13 +107,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </xslt:variable>
                        <xslt:variable name="书社:result" select="书社:document-with-attributes-applied(exsl:node-set($书社:result-fragment))"/>
                        <xslt:variable name="书社:destination" select="string($书社:about//*[@rdf:about=$IDENTIFIER]/@书社vocab:destination)"/>
-                       <for-each select="//catalog:uri">
-                               <xslt:include href="{@uri}">
-                                       <attribute name="书社:id">
-                                               <value-of select="@name"/>
-                                       </attribute>
-                               </xslt:include>
-                       </for-each>
                        <xslt:template name="书社:apply-attributes">
                                <xslt:param name="context-nodes" select="/.."/>
                                <xslt:param name="destination-nodes" select="/.."/>