X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=xsl%2Firspy2zeerex.xsl;h=781b8ad8a1cbc1e77b66fc85d5b3c21d482643ac;hb=47e0280045e93e5d7b742e43f0aa09324aec86cc;hp=95946dbc067eef2f0d0288f763311af8e7d6c0ed;hpb=2f055821db43c348a24f3af52ec9b657ff67c8eb;p=irspy-moved-to-github.git

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index 95946db..781b8ad 100644
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.2 2006-10-27 11:43:17 sondberg Exp $
+    $Id: irspy2zeerex.xsl,v 1.7 2006-10-27 13:41:57 sondberg Exp $
 
     This stylesheet is used by IRSpy to map the internal mixed Zeerex/IRSpy
     record format into the Zeerex record which we store.
@@ -22,9 +22,9 @@
   <xsl:preserve-space elements="*"/>
 
   <xsl:variable name="old_indexes" select="/*/explain:indexInfo/explain:index"/>
-  <xsl:variable name="old_syntaxes" select="/*/explain:recordInfo"/>
-
+  <xsl:variable name="use_attr_names" select="document('use-attr-names.xml')"/>
 
+  
   <xsl:template match="node() | @*">
     <xsl:copy>
       <xsl:apply-templates select="@* | node()"/>
@@ -32,14 +32,26 @@
   </xsl:template>
 
 
-  <xsl:template match="explain:indexInfo">
+  <xsl:template match="/*">
+    <explain>
+      <xsl:apply-templates select="explain:serverInfo   |
+                                   explain:databaseInfo |
+                                   explain:metaInfo"/>
+                                   
+      <xsl:call-template name="insert-indexInfo"/>
+      <xsl:call-template name="insert-recordInfo"/>
+    </explain>
+  </xsl:template>
+
+
+  <xsl:template name="insert-indexInfo">
     <indexInfo>
       <xsl:for-each select="/*/irspy:status/irspy:search">
         <xsl:variable name="set" select="@set"/>
         <xsl:variable name="ap" select="@ap"/>
         <xsl:variable name="old"
-         select="$old_indexes[explain:map/explain:attr/@set = $set and
-                              explain:map/explain:attr/text() = $ap]"/>
+            select="$old_indexes[explain:map/explain:attr/@set = $set and
+                                 explain:map/explain:attr/text() = $ap]"/>
         <xsl:choose>
           <xsl:when test="$old">
             <xsl:call-template name="insert-index-section">
@@ -55,7 +67,14 @@
   </xsl:template>
 
 
-  <xsl:template match="explain:recordInfo">
+  <xsl:template name="insert-recordInfo">
+    <recordInfo>
+      <xsl:for-each select="/*/irspy:status/irspy:record_fetch[@ok = 1]">
+        <recordSyntax name="{@syntax}">
+          <elementSet name="F"/> <!-- FIXME: This should be probed too -->
+        </recordSyntax>
+      </xsl:for-each>
+    </recordInfo>
   </xsl:template>
 
 
@@ -88,11 +107,18 @@
 
   <xsl:template name="insert-index-title">
     <xsl:param name="update"/>
-    <xsl:value-of select="$update/@ap"/>
+    <xsl:variable name="name"
+                select="$use_attr_names/*/map[@attr = $update/@ap and
+                                              @set = $update/@set]/@name"/>
+
+    <xsl:choose>
+      <xsl:when test="string-length($name) &gt; 0"><xsl:value-of
+                                            select="$name"/></xsl:when>
+      <xsl:otherwise><xsl:value-of select="$update/@ap"/></xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
 
-
   <xsl:template match="explain:dateModified">
     <dateModified><xsl:value-of
                     select="/*/irspy:status/*[last()]"/></dateModified>