X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/c26abcf07cd0f116b5810946744dd804cc41a208..d770bf2a7d9bf73560323fe027c9fa0d65d27fcb:/lib/catalog2transform.xslt?ds=inline

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 2315762..67ddb88 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -45,6 +45,19 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<xslt:variable name="书社:result">
 				<xslt:apply-templates select="exsl:node-set($书社:expansion)/node()"/>
 			</xslt:variable>
+			<xslt:variable name="书社:destination">
+				<xslt:choose>
+					<xslt:when test="string($书社:source/@书社:destination)!=''">
+						<xslt:value-of select="$书社:source/@书社:destination"/>
+					</xslt:when>
+					<xslt:when test="starts-with($PATH, '/')">
+						<xslt:value-of select="substring-after($PATH, '/')"/>
+					</xslt:when>
+					<xslt:otherwise>
+						<xslt:value-of select="$PATH"/>
+					</xslt:otherwise>
+				</xslt:choose>
+			</xslt:variable>
 			<for-each select="//catalog:uri">
 				<xslt:include href="{@uri}">
 					<if test="contains(@name, ':')">
@@ -272,9 +285,17 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				</xslt:copy>
 			</xslt:template>
 			<xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:application" priority="1"/>
-			<xslt:template match="书社:archive" mode="书社:application">
+			<xslt:template match="书社:archive" mode="书社:application" priority="1">
 				<xslt:copy>
-					<xslt:for-each select="@*|node()">
+					<xslt:for-each select="@*">
+						<xslt:choose>
+							<xslt:when test="local-name()='archived-as' and namespace-uri()='&书社;' and ../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]"/>
+							<xslt:otherwise>
+								<xslt:apply-templates select="." mode="书社:application"/>
+							</xslt:otherwise>
+						</xslt:choose>
+					</xslt:for-each>
+					<xslt:for-each select="node()">
 						<xslt:choose>
 							<xslt:when test="self::*">
 								<xslt:variable name="component">
@@ -291,7 +312,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 								</xslt:variable>
 								<xslt:apply-templates select="exsl:node-set($component)/node()" mode="书社:application"/>
 							</xslt:when>
-							<xslt:when test="../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)] and local-name()='archived-as' and namespace-uri()='&书社;'"/>
 							<xslt:otherwise>
 								<xslt:apply-templates select="." mode="书社:application"/>
 							</xslt:otherwise>
@@ -301,7 +321,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</xslt:template>
 			<xslt:template match="书社:apply-attributes" mode="书社:application" priority="1">
 				<xslt:variable name="children">
-					<xslt:apply-templates select="node()" mode="书社:application"/>
+					<xslt:apply-templates mode="书社:application"/>
 				</xslt:variable>
 				<xslt:call-template name="书社:apply-attributes">
 					<xslt:with-param name="context-nodes" select="."/>
@@ -309,7 +329,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				</xslt:call-template>
 			</xslt:template>
 			<xslt:template match="书社:apply-attributes-to-root" mode="书社:application" priority="1">
-				<xslt:apply-templates select="node()" mode="书社:application"/>
+				<xslt:apply-templates mode="书社:application"/>
 			</xslt:template>
 			<xslt:template match="/node()" mode="书社:expand" priority="0">
 				<xslt:copy>
@@ -389,7 +409,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<xslt:template match="text()" mode="书社:header"/>
 			<xslt:template match="text()" mode="书社:footer"/>
 			<xslt:template match="text()" mode="书社:metadata"/>
-			<xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea 书社:raw-text"/>
+			<xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea 书社:raw-output 书社:raw-text"/>
 		</xslt:transform>
 	</template>
 	<output method="xml" encoding="UTF-8"/>