X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/33cd26f85eec175028a9e7ced1562e34ff3d15d6..8b898cc1e883b2a5b3662a5c6b6913d5d0e7236d:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 67ddb88..c41e3b1 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -17,23 +17,28 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 ]>
 <transform
 	xmlns="http://www.w3.org/1999/XSL/Transform"
-	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns:dct="http://purl.org/dc/terms/"
 	xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
 	xmlns:exsl="http://exslt.org/common"
 	xmlns:exslstr="http://exslt.org/strings"
+	xmlns:html="http://www.w3.org/1999/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"
 	xmlns:xlink="http://www.w3.org/1999/xlink"
 	xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
 	xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
+	exclude-result-prefixes="catalog"
 	version="1.0"
 >
 	<namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
 	<template match="/">
-		<xslt:transform exclude-result-prefixes="catalog" extension-element-prefixes="exsl exslstr" version="1.0">
+		<xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="exsl exslstr" version="1.0">
 			<xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
 			<xslt:param name="CKSUM" select="false()"/>
-			<xslt:param name="CATALOG" select="'catalog'"/>
 			<xslt:param name="IDENTIFIER" select="false()"/>
+			<xslt:param name="METADATA" select="'metadata'"/>
 			<xslt:param name="PATH" select="'/unknown'"/>
 			<xslt:param name="SRCREV" select="false()"/>
 			<xslt:param name="SRCTIME" select="'1972-12-31T00:00:00Z'"/>
@@ -178,14 +183,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</xslt:template>
 			<xslt:template name="书社:wrap">
 				<xslt:param name="nodes" select="/.."/>
-				<xslt:variable name="modalinput">
+				<xslt:variable name="modalinput-fragment">
 					<xslt:copy-of select="$nodes"/>
 					<xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
 				</xslt:variable>
-				<xslt:variable name="metadata">
+				<xslt:variable name="modalinput" select="exsl:node-set($modalinput-fragment)"/>
+				<xslt:variable name="metadata-fragment">
 					<xslt:copy-of select="$nodes[self::html:html]/html:head/node()|$nodes[self::html:head]/node()"/>
-					<xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:metadata"/>
+					<xslt:apply-templates select="$modalinput/node()" mode="书社:metadata"/>
 				</xslt:variable>
+				<xslt:variable name="metadata" select="exsl:node-set($metadata-fragment)"/>
 				<html:html>
 					<xslt:copy-of select="$nodes[self::html:html]/@*"/>
 					<xslt:if test="not($nodes[self::html:html]/@书社:archived-as) and $nodes/@书社:archived-as">
@@ -206,7 +213,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					<html:head>
 						<xslt:copy-of select="$nodes[self::html:html]/html:head/@*|$nodes[self::html:head]/@*"/>
 						<html:title>
-							<xslt:for-each select="exsl:node-set($metadata)/html:title">
+							<xslt:for-each select="$metadata/html:title">
 								<xslt:value-of select="."/>
 								<xslt:if test="position()!=last()">
 									<xslt:text>
@@ -215,10 +222,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 								</xslt:if>
 							</xslt:for-each>
 						</html:title>
-						<xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::html:title)]"/>
+						<xslt:copy-of select="$metadata/node()[not(self::html:title or self::html:meta and @name='generator')]"/>
 						<html:meta name="generator">
 							<xslt:attribute name="content">
-								<xslt:for-each select="exsl:node-set($metadata)/html:meta[@name='generator']">
+								<xslt:for-each select="$metadata/html:meta[@name='generator']">
 									<xslt:value-of select="@content"/>
 									<xslt:text>
 										<text>, </text>
@@ -241,9 +248,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					</html:head>
 					<html:body>
 						<xslt:copy-of select="$nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*"/>
-						<xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:header"/>
+						<xslt:apply-templates select="$modalinput/node()" mode="书社:header"/>
 						<xslt:copy-of select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()"/>
-						<xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:footer"/>
+						<xslt:apply-templates select="$modalinput/node()" mode="书社:footer"/>
 					</html:body>
 				</html:html>
 			</xslt:template>
@@ -360,7 +367,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</xslt:template>
 			<xslt:template match="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
 				<xslt:variable name="identifier" select="string(@xlink:href)"/>
-				<xslt:variable name="uri" select="substring-before(document($CATALOG)//catalog:uri[@name=$identifier]/@uri[1], '#')"/>
+				<xslt:variable name="uri" select="document($METADATA)//*[@rdf:about=$identifier]/dct:hasFormat/*[nie:interpretedAs/*[@nie:mimeType='application/xml']]/@nfo:fileUrl[1]"/>
 				<xslt:choose>
 					<xslt:when test="$uri">
 						<xslt:variable name="expanded">