Adding named result set test.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 52c586e..877f9f4 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.42 2006-10-27 15:36:04 mike Exp $
+# $Id: IRSpy.pm,v 1.46 2006-11-01 10:14:09 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -6,9 +6,6 @@ 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;
@@ -19,10 +16,10 @@ 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';
 
 
@@ -472,13 +469,6 @@ sub _gather_tests {
     my $fullName = "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
 
     eval {
-       ### 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 ($@) {
@@ -556,38 +546,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/');
-    $xc->registerNs(i => $irspy_ns);
-    return $xc;
-}
-
-
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record,