X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=52c586e8b611db1ca895b5167bff2ed7d478bc6d;hp=15d1124a1a57bcf53de6f3932952072e9d48c9c3;hb=d1650850febb5bdc6212d60049899c0b53532a4a;hpb=9bbd082cc2fb515fd5135c44ceb7b173b13ec69b

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 15d1124..52c586e 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.37 2006-10-26 13:39:13 sondberg Exp $
+# $Id: IRSpy.pm,v 1.42 2006-10-27 15:36:04 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -85,7 +85,7 @@ sub new {
 	targets => undef,	# filled in later
 	connections => undef,	# filled in later
         libxml => $libxml,
-        irspy_to_zeerex_style => $xslt->parse_stylesheet($xsl_doc),
+        irspy_to_zeerex_style => $irspy_to_zeerex_style,
 	tests => [],		# stack of tests currently being executed
     }, $class;
     $this->log("irspy", "starting up with database '$dbname'");
@@ -256,14 +256,21 @@ sub _rewrite_record {
 
     $conn->log("irspy", "rewriting XML record");
     my $rec = $this->_irspy_to_zeerex($conn);
-    my $p = $this->{conn}->package();
+    _really_rewrite_record($this->{conn}, $rec);
+}
+
+
+sub _really_rewrite_record {
+    my($conn, $rec) = @_;
+
+    my $p = $conn->package();
     $p->option(action => "specialUpdate");
     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) {
@@ -309,7 +316,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;
 
@@ -460,11 +467,22 @@ 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";
+	### This next line shouldn't be necessary, as we should
+	#   already be running in an environment where the test
+	#   modules are available -- otherwise, how did _this_ module
+	#   get loaded?  But it seems that for reasons I don't
+	#   understand we do sometimes (not always!) need this when
+	#   running under Apache.
+	use lib '/usr/local/src/cvs/irspy/lib';
+	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;
@@ -565,6 +583,7 @@ sub irspy_xpath_context {
     my $root = $doc->getDocumentElement();
     my $xc = XML::LibXML::XPathContext->new($root);
     $xc->registerNs(e => 'http://explain.z3950.org/dtd/2.0/');
+    $xc->registerNs(i => $irspy_ns);
     return $xc;
 }