From: Anders S. Mortensen <sondberg@indexdata.dk>
Date: Tue, 12 Dec 2006 11:09:52 +0000 (+0000)
Subject: Finally fixing bug #762.
X-Git-Tag: CPAN-v1.02~685
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a9f0eded1cbfcb06d3293fb55b101b49b7dc9bc9;p=irspy-moved-to-github.git

Finally fixing bug #762.
---

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index 162ae5e..3b31e3b 100644
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.14 2006-12-11 13:58:17 sondberg 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.
@@ -124,16 +124,54 @@
   -->
   <xsl:template name="insert-irspySection">
     <irspy:status>
-      <xsl:for-each
-          select="*/irspy:probe   |
-                  */irspy:boolean[irspy:strcmp(text(), $ping_date) >= 0] |
-                  */irspy:named_resultset[irspy:strcmp(text(),$ping_date) >= 0]|
-                  */irspy:explain[irspy:strcmp(text(),$ping_date) >= 0]">
-        <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>