X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=d606b6ad150bf6e9bcc1ffba18f2e24a6217f37c;hb=1a4c5ca7fe06c3e6b864b45ea071d500753d3ab5;hp=e3c4be4788089294045c60a7aacb93979e79956b;hpb=8dfab402e27f12c13842e9d55432c934b03c69d2;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index e3c4be4..d606b6a 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.35 2006-10-20 14:49:11 mike Exp $
+# $Id: IRSpy.pm,v 1.45 2006-10-30 16:13:49 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -6,20 +6,22 @@ use 5.008;
 use strict;
 use warnings;
 
-use Exporter 'import';
-our @EXPORT_OK = qw(xml_encode irspy_xpath_context);
-
 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
@@ -69,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'");
@@ -229,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) {
@@ -288,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;
 
@@ -421,6 +447,8 @@ sub check {
 		    $nskipped += $n;
 		}
 	    }
+	} else {
+	    die "unknown callback return-value '$res'";
 	}
     }
 
@@ -437,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;
@@ -515,37 +547,6 @@ sub _next_sibling_test {
 }
 
 
-# Utility functions follow, exported for use of web UI
-
-# I can't -- just can't, can't, can't -- believe that this function
-# isn't provided by one of the core XML modules.  But the evidence all
-# says that it's not: among other things, XML::Generator and
-# Template::Plugin both roll their own.  So I will do likewise.  D'oh!
-#
-sub xml_encode {
-    my ($text) = @_;
-    $text =~ s/&/&/g;
-    $text =~ s/</&lt;/g;
-    $text =~ s/>/&gt;/g;
-    $text =~ s/['']/&apos;/g;
-    $text =~ s/[""]/&quot;/g;
-    return $text;
-}
-
-
-sub irspy_xpath_context {
-    my($zoom_record) = @_;
-
-    my $xml = $zoom_record->render();
-    my $parser = new XML::LibXML();
-    my $doc = $parser->parse_string($xml);
-    my $root = $doc->getDocumentElement();
-    my $xc = XML::LibXML::XPathContext->new($root);
-    $xc->registerNs(e => 'http://explain.z3950.org/dtd/2.0/');
-    return $xc;
-}
-
-
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record,