X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/5a363a0a9e519b88fed12252328acd4bfa7689e5..dbf56be3edcdddade3a67366bb3360d22c43d16e:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index ce94067..2c1a40e 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -23,7 +23,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 	xmlns:exslfunc="http://exslt.org/functions"
 	xmlns:exslstr="http://exslt.org/strings"
 	xmlns:html="&xhtml;"
-	xmlns:nie="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#"
 	xmlns:nfo="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:svg="http://www.w3.org/2000/svg"
@@ -53,7 +52,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				</if>
 			</for-each>
 		</variable>
-		<xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="exsl exslfunc exslstr" version="1.0">
+		<xslt:transform exclude-result-prefixes="nfo" extension-element-prefixes="exsl exslfunc exslstr" version="1.0">
 			<xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
 			<xslt:param name="IDENTIFIER" select="false()"/>
 			<xslt:param name="SRCREV" select="false()"/>
@@ -86,6 +85,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 +106,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="/.."/>
@@ -444,7 +443,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					<xslt:apply-templates select="@*|node()" mode="书社:expand"/>
 				</xslt:copy>
 			</xslt:template>
-			<xslt:template match="text()" mode="书社:header"/>
+			<xslt:template match="text()" mode="书社:header" priority="-1"/>
 			<xslt:template match="书社:archive" mode="书社:finalize" priority="1">
 				<xslt:copy>
 					<xslt:apply-templates select="@*" mode="书社:finalize"/>
@@ -518,8 +517,8 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					<xslt:apply-templates select="@*|node()" mode="书社:finalize"/>
 				</xslt:copy>
 			</xslt:template>
-			<xslt:template match="text()" mode="书社:footer"/>
-			<xslt:template match="text()" mode="书社:metadata"/>
+			<xslt:template match="text()" mode="书社:footer" priority="-1"/>
+			<xslt:template match="text()" mode="书社:metadata" priority="-1"/>
 			<xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea 书社:raw-output 书社:raw-text"/>
 		</xslt:transform>
 	</template>