From: Mike Taylor <mike@indexdata.com>
Date: Fri, 20 Oct 2006 14:51:01 +0000 (+0000)
Subject: xml_encode() moved to IRSpy.pm
X-Git-Tag: CPAN-v1.02~946
X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=e41cd68b20590821ebda2faf6faa3ed0312cc1a2

xml_encode() moved to IRSpy.pm
Exporting structure removed.
---

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index c213f54..532603a 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.15 2006-10-13 13:41:57 sondberg Exp $
+# $Id: Record.pm,v 1.16 2006-10-20 14:51:01 mike Exp $
 
 package ZOOM::IRSpy::Record;
 
@@ -6,9 +6,6 @@ use 5.008;
 use strict;
 use warnings;
 
-use Exporter 'import';
-our @EXPORT_OK = qw(xml_encode);
-
 use XML::LibXML;
 use XML::LibXML::XPathContext;
 
@@ -51,9 +48,9 @@ sub _empty_zeerex_record {
     ### Doesn't recognise SRU/SRW URLs
     my($host, $port, $db) = ZOOM::IRSpy::_parse_target_string($target);
 
-    my $xhost = xml_encode($host);
-    my $xport = xml_encode($port);
-    my $xdb = xml_encode($db);
+    my $xhost = ZOOM::IRSpy::xml_encode($host);
+    my $xport = ZOOM::IRSpy::xml_encode($port);
+    my $xdb = ZOOM::IRSpy::xml_encode($db);
     return <<__EOT__;
 <explain xmlns="http://explain.z3950.org/dtd/2.0/">
  <serverInfo protocol="Z39.50" version="1995">
@@ -66,22 +63,6 @@ __EOT__
 }
 
 
-# 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/&/&amp;/g;
-    $text =~ s/</&lt;/g;
-    $text =~ s/>/&gt;/g;
-    $text =~ s/['']/&apos;/g;
-    $text =~ s/[""]/&quot;/g;
-    return $text;
-}
-
-
 sub append_entry {
     my $this = shift();
     my($xpath, $frag) = @_;