Only select those irspy:xxx entries newer than the status/ping date. Still need

to handle the situation where there are no newer entries so that we'll need to
select the entries corresponding to previous run.

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index b190d62..098946a 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.52 2006-12-06 11:26:52 mike Exp $
+# $Id: IRSpy.pm,v 1.53 2006-12-11 13:58:17 sondberg Exp $
 
 package ZOOM::IRSpy;
 
@@ -72,6 +72,10 @@ sub new {
        or die "$0: can't connection to IRSpy database 'dbname'";
 
     my $xslt = new XML::LibXSLT;
+
+    $xslt->register_function($ZOOM::IRSpy::Utils::IRSPY_NS, 'strcmp',
+                             \&ZOOM::IRSpy::Utils::xslt_strcmp);
+
     my $libxml = new XML::LibXML;
     my $xsl_doc = $libxml->parse_file($irspy_to_zeerex_xsl);
     my $irspy_to_zeerex_style = $xslt->parse_stylesheet($xsl_doc);
@@ -241,9 +245,16 @@ sub _render_record {
 sub _irspy_to_zeerex {
     my ($this, $conn) = @_;
     my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
+    #open FH, '>/tmp/irspy_orig.xml';
+    #print FH $irspy_doc->toString();
+    #close FH;
     my %params = ();
     my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
 
+    #open FH, '>/tmp/irspy_transformed.xml';
+    #print FH $result->toString();
+    #close FH;
+
     return $result->documentElement();
 }
 

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 6367761..371a7de 100644 (file)
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.19 2006-12-05 17:19:35 mike Exp $
+# $Id: Utils.pm,v 1.20 2006-12-11 13:58:17 sondberg Exp $
 
 package ZOOM::IRSpy::Utils;
 
@@ -285,7 +285,11 @@ sub inheritance_tree {
 }
 
 
-#print "Loaded ZOOM::IRSpy::Utils.pm";
+# This function is made available in xslt using the register_function call
+sub xslt_strcmp {
+    my ($arg1, $arg2) = @_;
+    return ($arg1->to_literal()) cmp ($arg2->to_literal());
+}
 
 
 1;

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index 8a64677..162ae5e 100644 (file)
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.13 2006-12-11 11:01:14 sondberg Exp $
+    $Id: irspy2zeerex.xsl,v 1.14 2006-12-11 13:58:17 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,8 +41,7 @@
     <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>
 
@@ -121,14 +121,14 @@
   <!-- 
        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: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>
     </irspy:status>