X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=xsl%2Firspy2zeerex.xsl;h=939f4629d3b5b90536921be9dd6b85b3d76c44df;hb=e60b68b7b685359133501922e8a57a59c8b4ad67;hp=f09f936661c021e33b431a8fda51bba1e8aba1c1;hpb=00fab0af8f6dada15807d76829f534ffd9a3e1f6;p=irspy-moved-to-github.git

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index f09f936..939f462 100644
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.8 2006-10-30 14:55:27 sondberg Exp $
+    $Id: irspy2zeerex.xsl,v 1.11 2006-11-02 11:46:41 sondberg Exp $
 
     This stylesheet is used by IRSpy to map the internal mixed Zeerex/IRSpy
     record format into the Zeerex record which we store.
@@ -19,25 +19,15 @@
       version="1.0"
       encoding="UTF-8"/>
 
-  <xsl:preserve-space elements="*"/>
+  <xsl:strip-space elements="*"/>
 
   <xsl:variable name="old_indexes" select="/*/explain:indexInfo/explain:index"/>
   <xsl:variable name="use_attr_names" select="document('use-attr-names.xml')"/>
 
-  
-  <xsl:template match="node() | @*">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 
   <xsl:template match="/*">
     <explain>
-      <xsl:apply-templates select="explain:serverInfo   |
-                                   explain:databaseInfo |
-                                   explain:metaInfo"/>
-                                   
+      <xsl:call-template name="insert-zeerexBase"/>
       <xsl:call-template name="insert-indexInfo"/>
       <xsl:call-template name="insert-recordInfo"/>
       <xsl:call-template name="insert-irspySection"/>
@@ -45,6 +35,16 @@
   </xsl:template>
 
 
+  <xsl:template name="insert-zeerexBase">
+    <xsl:copy-of select="explain:serverInfo"/>
+    <xsl:copy-of select="explain:databaseInfo"/>
+    <metaInfo>
+      <dateModified><xsl:value-of
+                    select="/*/irspy:status/*[last()]"/></dateModified>
+    </metaInfo>
+  </xsl:template>
+
+
   <xsl:template name="insert-indexInfo">
     <indexInfo>
       <xsl:for-each select="/*/irspy:status/irspy:search">
@@ -79,8 +79,27 @@
   </xsl:template>
 
 
+  <!-- 
+       Here we list the bits and pieces of the irspy:status element which we
+       want to keep in the persistent version of the zeerex record.
+       Simply add "| irspy:xxx" to the select attribute.
+  -->
   <xsl:template name="insert-irspySection">
-    <xsl:copy-of select="/*/irspy:status"/>
+    <irspy:status>
+      <xsl:for-each select="*/irspy:probe   |
+                            */irspy:boolean |
+                            */irspy:named_resultset |
+                            */irspy:explain">
+        <xsl:copy-of select="."/>
+      </xsl:for-each>
+    </irspy:status>
+  </xsl:template>
+
+  
+  <xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:copy>
   </xsl:template>
 
 
@@ -125,10 +144,6 @@
   </xsl:template>
 
 
-  <xsl:template match="explain:dateModified">
-    <dateModified><xsl:value-of
-                    select="/*/irspy:status/*[last()]"/></dateModified>
-  </xsl:template>
-
+  <xsl:template match="*"/>
 
 </xsl:stylesheet>