X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=38641ee7ceb1d58ea759fb569ae4887fa376ef35;hb=512aa2caede0fcaa7f7700569a337bd65be48cb8;hp=2f67dc1d2b60e5eba2a58ac097c761b02025b713;hpb=acc9fdde66959c0e1faa75d6e8ca2936c18fc9f4;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 2f67dc1..38641ee 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.8 2006-07-24 16:44:00 mike Exp $
+# $Id: Record.pm,v 1.17 2006-10-23 12:22:52 sondberg Exp $
package ZOOM::IRSpy::Record;
@@ -26,7 +26,7 @@ I<## To follow>
sub new {
my $class = shift();
- my($target, $zeerex) = @_;
+ my($irspy, $target, $zeerex) = @_;
if (!defined $zeerex) {
$zeerex = _empty_zeerex_record($target);
@@ -34,6 +34,7 @@ sub new {
my $parser = new XML::LibXML();
return bless {
+ irspy => $irspy,
target => $target,
parser => $parser,
zeerex => $parser->parse_string($zeerex)->documentElement(),
@@ -47,12 +48,15 @@ sub _empty_zeerex_record {
### Doesn't recognise SRU/SRW URLs
my($host, $port, $db) = ZOOM::IRSpy::_parse_target_string($target);
+ my $xhost = ZOOM::IRSpy::xml_encode($host);
+ my $xport = ZOOM::IRSpy::xml_encode($port);
+ my $xdb = ZOOM::IRSpy::xml_encode($db);
return <<__EOT__;
- $host
- $port
- $db
+ $xhost
+ $xport
+ $xdb
__EOT__
@@ -63,11 +67,11 @@ sub append_entry {
my $this = shift();
my($xpath, $frag) = @_;
- print STDERR "this=$this, xpath='$xpath', frag='$frag'\n";
+ #print STDERR "this=$this, xpath='$xpath', frag='$frag'\n";
my $root = $this->{zeerex}; # XML::LibXML::Element ISA XML::LibXML::Node
my $xc = XML::LibXML::XPathContext->new($root);
$xc->registerNs(zeerex => "http://explain.z3950.org/dtd/2.0/");
- $xc->registerNs(irspy => "http://indexdata.com/irspy/1.0");
+ $xc->registerNs(irspy => $ZOOM::IRSpy::irspy_ns);
my @nodes = $xc->findnodes($xpath);
if (@nodes == 0) {
@@ -82,14 +86,24 @@ sub append_entry {
if @nodes == 0;
}
- ZOOM::Log::log("irspy",
- scalar(@nodes), " matches for '$xpath': using first")
+ $this->{irspy}->log("warn",
+ scalar(@nodes), " matches for '$xpath': using first")
if @nodes > 1;
- my $node = $nodes[0];
- # $node ISA XML::LibXML::ElementXML::LibXML::Element
- $this->_half_decent_appendWellBalancedChunk($node, $frag);
- #print STDERR "POST: zeerex='$root' = \n", $root->toString(), "\n";
+ $this->_half_decent_appendWellBalancedChunk($nodes[0], $frag);
+}
+
+sub store_result {
+ my ($this, $type, %info) = @_;
+ my $xml = "_string2cdata($info{$key}) . "\"";
+ }
+
+ $xml .= ">" . $this->_isodate(time()) . "\n";
+
+ $this->append_entry('irspy:status', $xml);
}
@@ -109,7 +123,7 @@ sub append_entry {
# namespace mapping for that node -- but that only affects pre-parsed
# trees, and is no use for parsing. Hence the following pair of lines
# DOES NOT WORK:
-# $node->setNamespace("http://indexdata.com/irspy/1.0", "irspy", 0);
+# $node->setNamespace($ZOOM::IRSpy::irspy_ns, "irspy", 0);
# $node->appendWellBalancedChunk($frag);
#
# Instead I have to go the long way round, hence this method. I have
@@ -123,7 +137,7 @@ sub _half_decent_appendWellBalancedChunk {
my($node, $frag) = @_;
if (1) {
- $frag =~ s,>, xmlns:irspy="http://indexdata.com/irspy/1.0">,;
+ $frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::irspy_ns">,;
$node->appendWellBalancedChunk($frag);
return;
}
@@ -140,7 +154,28 @@ sub _half_decent_appendWellBalancedChunk {
die "mismatched XML start/end <$open>...<$close>"
if $close ne $tag;
print STDERR "tag='$tag', attrs=[$attrs], content='$content'\n";
- die "### no code yet to make DOM node";
+ die "## no code yet to make DOM node";
+}
+
+
+# Yes, I know that this is already implemented in IRSpy.pm. I suggest that we
+# introduce a toolkit package with such subroutines...
+#
+sub _string2cdata {
+ my ($this, $buffer) = @_;
+ $buffer =~ s/&/&/gs;
+ $buffer =~ s/</gs;
+ $buffer =~ s/>/>/gs;
+ $buffer =~ s/"/"/gs;
+ $buffer =~ s/'/'/gs;
+
+ return $buffer;
+}
+
+
+sub _isodate {
+ my ($this, $time) = @_;
+ return ZOOM::IRSpy::Test::isodate($time);
}