X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=xsl%2Firspy2zeerex.xsl;h=3b31e3bfc92713cbe55881a9bc27219f60d0c1ea;hp=4c630561a6a0389c706713c63973875ee9c0244b;hb=eae0cc5511d06761d8067d7046d110ba8f25dd64;hpb=73694dbb31330085b808d8b8fd7e17603f2ae0d6

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index 4c63056..3b31e3b 100644
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.12 2006-12-06 12:58:32 mike Exp $
+    $Id: irspy2zeerex.xsl,v 1.15 2006-12-12 11:09:52 sondberg Exp $
 
     This stylesheet is used by IRSpy to map the internal mixed Zeerex/IRSpy
     record format into the Zeerex record which we store.
@@ -23,6 +23,7 @@
 
   <xsl:variable name="old_indexes" select="/*/explain:indexInfo/explain:index"/>
   <xsl:variable name="use_attr_names" select="document('use-attr-names.xml')"/>
+  <xsl:variable name="ping_date" select="/*/irspy:status/irspy:probe[last()]"/>
 
 
   <xsl:template match="/*">
@@ -40,51 +41,79 @@
     <xsl:copy-of select="explain:serverInfo"/>
     <xsl:copy-of select="explain:databaseInfo"/>
     <metaInfo>
-      <dateModified><xsl:value-of
-                    select="/*/irspy:status/*[last()]"/></dateModified>
+      <dateModified><xsl:value-of select="$ping_date"/></dateModified>
     </metaInfo>
   </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]"/>
-        <xsl:choose>
-          <xsl:when test="$old">
-            <xsl:call-template name="insert-index-section">
-              <xsl:with-param name="title" select="$old/explain:title"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="insert-index-section"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
+      <xsl:choose>
+
+        <!-- Check that search was actually probed -->
+        <xsl:when test="/*/irspy:status/irspy:search">
+          <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]"/>
+            <xsl:choose>
+              <xsl:when test="$old">
+                <xsl:call-template name="insert-index-section">
+                  <xsl:with-param name="title" select="$old/explain:title"/>
+                </xsl:call-template>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:call-template name="insert-index-section"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:for-each>
+        </xsl:when>
+
+        <!-- If not, insert what we already had... -->
+        <xsl:otherwise>
+          <xsl:copy-of select="explain:indexInfo/*"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </indexInfo>
   </xsl:template>
 
 
   <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>
+      <xsl:choose>
+
+        <!-- Did we actually probe record syntaxes? -->
+        <xsl:when test="/*/irspy:status/irspy:record">
+          <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>
+        </xsl:when>
+
+        <!-- If not, use the existing test report... -->
+        <xsl:otherwise>
+          <xsl:copy-of select="explain:recordInfo/*"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </recordInfo>
   </xsl:template>
 
 
   <xsl:template name="insert-configInfo">
     <configInfo>
-      <xsl:for-each select="/*/irspy:status/irspy:init_opt">
-        <supports type="z3950_{@option}">1</supports>
-      </xsl:for-each>
+      <xsl:choose>
+        <xsl:when test="/*/irspy:status/irspy:init_opt">
+          <xsl:for-each select="/*/irspy:status/irspy:init_opt">
+            <supports type="z3950_{@option}">1</supports>
+          </xsl:for-each>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="explain:configInfo/*"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </configInfo>
   </xsl:template>
 
@@ -92,19 +121,57 @@
   <!-- 
        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">
     <irspy:status>
-      <xsl:for-each select="*/irspy:probe   |
-                            */irspy:boolean |
-                            */irspy:named_resultset |
-                            */irspy:explain">
-        <xsl:copy-of select="."/>
-      </xsl:for-each>
+      <xsl:copy-of select="*/irspy:probe"/>
+
+      <xsl:call-template name="insert-latest-nodes">
+        <xsl:with-param name="nodes" select="*/irspy:boolean"/>
+      </xsl:call-template>
+      
+      <xsl:call-template name="insert-latest-nodes">
+        <xsl:with-param name="nodes" select="*/irspy:named_resultset"/>
+      </xsl:call-template>
+      
+      <xsl:call-template name="insert-latest-nodes">
+        <xsl:with-param name="nodes" select="*/irspy:explain"/>
+      </xsl:call-template>
     </irspy:status>
   </xsl:template>
 
+
+  <!-- 
+       NB: This template assumes that the irspy:probe nodes come in ascending
+       order. If this is not the case, this template has to do some kind of
+       sorting which makes the whole thing more complicated.
+
+       Dec 12, 2006: Anders
+  -->
+  <xsl:template name="insert-latest-nodes">
+    <xsl:param name="nodes"/>
+    <xsl:param name="i" select="count(*/irspy:probe[@ok='1'])"/>
+    <xsl:variable name="date"
+        select="*/irspy:probe[@ok='1' and position() = $i]"/>
+    <xsl:variable name="latest"
+        select="$nodes[irspy:strcmp(text(), $date) > 0]"/>
+
+    <xsl:choose>
+      <xsl:when test="$latest">
+        <xsl:copy-of select="$latest"/>
+      </xsl:when>
+      <xsl:when test="$i > 0">
+        <xsl:call-template name="insert-latest-nodes">
+          <xsl:with-param name="nodes" select="$nodes"/>
+          <xsl:with-param name="i" select="$i - 1"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <irspy:missing/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   
   <xsl:template match="node() | @*">
     <xsl:copy>