X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=d606b6ad150bf6e9bcc1ffba18f2e24a6217f37c;hb=647329e10a87073556cb2a9726b129ff40ba125d;hp=aad702c337e40d7fc2895da6592c0ccfcc90d9d8;hpb=9f74222ecbca15c4ca23236b07c08c2ced5d2430;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index aad702c..d606b6a 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.31 2006-10-13 15:17:25 mike Exp $
+# $Id: IRSpy.pm,v 1.45 2006-10-30 16:13:49 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -6,16 +6,22 @@ use 5.008;
 use strict;
 use warnings;
 
-use Data::Dumper; # For debugging only
+use Data::Dumper;		# For debugging only
+use File::Basename;
+use XML::LibXSLT;
+use XML::LibXML;
+use XML::LibXML::XPathContext;
 use ZOOM;
 use Net::Z3950::ZOOM 1.13;	# For the ZOOM version-check only
 use ZOOM::IRSpy::Node;
 use ZOOM::IRSpy::Connection;
 use ZOOM::IRSpy::Record;
+use ZOOM::IRSpy::Utils;
 
 our @ISA = qw();
 our $VERSION = '0.02';
 our $irspy_ns = 'http://indexdata.com/irspy/1.0';
+our $irspy_to_zeerex_xsl = dirname(__FILE__) . '/../../xsl/irspy2zeerex.xsl';
 
 
 # Enumeration for callback functions to return
@@ -65,12 +71,19 @@ sub new {
     my $conn = new ZOOM::Connection($dbname, 0, @options)
 	or die "$0: can't connection to IRSpy database 'dbname'";
 
+    my $xslt = new XML::LibXSLT;
+    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);
+
     my $this = bless {
 	conn => $conn,
 	allrecords => 1,	# unless overridden by targets()
 	query => undef,		# filled in later
 	targets => undef,	# filled in later
 	connections => undef,	# filled in later
+        libxml => $libxml,
+        irspy_to_zeerex_style => $irspy_to_zeerex_style,
 	tests => [],		# stack of tests currently being executed
     }, $class;
     $this->log("irspy", "starting up with database '$dbname'");
@@ -225,20 +238,37 @@ sub _render_record {
 }
 
 
+sub _irspy_to_zeerex {
+    my ($this, $conn) = @_;
+    my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
+    my %params = ();
+    my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
+
+    return $result->documentElement();
+}
+
+
 sub _rewrite_record {
     my $this = shift();
     my($conn) = @_;
 
     $conn->log("irspy", "rewriting XML record");
-    my $rec = $conn->record();
-    my $p = $this->{conn}->package();
+    my $rec = $this->_irspy_to_zeerex($conn);
+    _really_rewrite_record($this->{conn}, $rec);
+}
+
+
+sub _really_rewrite_record {
+    my($conn, $rec) = @_;
+
+    my $p = $conn->package();
     $p->option(action => "specialUpdate");
-    my $xml = $rec->{zeerex}->toString();
+    my $xml = $rec->toString();
     $p->option(record => $xml);
     $p->send("update");
     $p->destroy();
 
-    $p = $this->{conn}->package();
+    $p = $conn->package();
     $p->send("commit");
     $p->destroy();
     if (0) {
@@ -284,7 +314,7 @@ sub check {
 
     $tname = "Main" if !defined $tname;
     $this->{tree} = $this->_gather_tests($tname)
-	or die "No tests defined";
+	or die "No tests defined for '$tname'";
     #$this->{tree}->print(0);
     my $nskipped = 0;
 
@@ -338,7 +368,7 @@ sub check {
 
 		my $task = $conn->next_task();
 		die "no next task queued for $conn" if !defined $task;
-		$conn->log("irspy_task", "starting task $task");
+		$conn->log("irspy_task", "preparing task $task");
 		$conn->next_task(0);
 		$conn->current_task($task);
 		$task->run();
@@ -404,14 +434,21 @@ sub check {
 	} elsif ($res == ZOOM::IRSpy::Status::TEST_GOOD ||
 		 $res == ZOOM::IRSpy::Status::TEST_BAD) {
 	    my $x = ($res == ZOOM::IRSpy::Status::TEST_GOOD) ? "good" : "bad";
+	    $conn->log("irspy_task", "test ended during task $task ($x)");
 	    $conn->log("irspy_test", "test completed ($x)");
 	    $conn->current_task(0);
 	    $conn->next_task(0);
 	    if ($res == ZOOM::IRSpy::Status::TEST_BAD) {
-		### Should skip over remaining sibling tests if TEST_BAD
-		### Should count the number of skipped siblings
-		$nskipped += 1;
+		my $address = $conn->option('current_test_address');
+		($address, my $n) = $this->_last_sibling_test($address);
+		if (defined $address) {
+		    $conn->log("irspy_test", "skipped $n tests");
+		    $conn->option(current_test_address => $address);
+		    $nskipped += $n;
+		}
 	    }
+	} else {
+	    die "unknown callback return-value '$res'";
 	}
     }
 
@@ -428,11 +465,15 @@ sub _gather_tests {
 	join(" -> ", @ancestors, $tname))
 	if grep { $_ eq $tname } @ancestors;
 
+    my $slashSeperatedTname = $tname;
+    $slashSeperatedTname =~ s/::/\//g;
+    my $fullName = "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
+
     eval {
-	my $slashSeperatedTname = $tname;
-	$slashSeperatedTname =~ s/::/\//g;
-	require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
+	require $fullName;
+	$this->log("irspy", "successfully required '$fullName'");
     }; if ($@) {
+	$this->log("irspy", "couldn't require '$fullName': $@");
 	$this->log("warn", "can't load test '$tname': skipping",
 		   $@ =~ /^Can.t locate/ ? () : " ($@)");
 	return undef;
@@ -449,6 +490,7 @@ sub _gather_tests {
 }
 
 
+# These next three should arguably be Node methods
 sub _next_test {
     my $this = shift();
     my($address, $omit_child) = @_;
@@ -473,6 +515,38 @@ sub _next_test {
 }
 
 
+sub _last_sibling_test {
+    my $this = shift();
+    my($address) = @_;
+
+    return undef
+	if !defined $this->_next_sibling_test($address);
+
+    my $nskipped = 0;
+    while (1) {
+	my $maybe = $this->_next_sibling_test($address);
+	last if !defined $maybe;
+	$nskipped++;
+	$this->log("irspy", "skipping $nskipped tests to '$address'");
+	$address = $maybe;
+    }
+
+    return ($address, $nskipped);
+}
+
+
+sub _next_sibling_test {
+    my $this = shift();
+    my($address) = @_;
+
+    my @components = split /:/, $address;
+    my $last = pop @components;
+    my $maybe = join(":", @components, $last+1);
+    return $maybe if $this->{tree}->select($maybe);
+    return undef;
+}
+
+
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record,