X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2FZOOM%2FIRSpy.pm;h=877f9f49caa24f86a4d9546fd55d7a2b21119600;hb=cffc7e022fec2dc52a445299cccf029c2c9c413a;hp=83d417c8184fb13aff1beaad51f1beb4b72bd094;hpb=2d9c2ad92984b793c0088c0138dfc7c72735f862;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 83d417c..877f9f4 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.40 2006-10-26 18:02:59 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';
 
 
@@ -256,14 +253,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) {
@@ -465,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 ($@) {
@@ -549,37 +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/');
-    return $xc;
-}
-
-
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record,