X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=68e23be370c6c3019361f43155a093c82ab4c3c6;hb=31ab2c939eb9c4bba6c703b733c39f74cc55c541;hp=008c49a7142907f3ddfaa93e69c279ad0e035ff6;hpb=08a63aeaaf3f0110e667dd2152e6d3f18c005ab1;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 008c49a..68e23be 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.3 2006-10-31 09:26:11 mike Exp $
+# $Id: Utils.pm,v 1.15 2006-11-16 17:18:14 mike Exp $
package ZOOM::IRSpy::Utils;
@@ -8,9 +8,15 @@ use warnings;
use Exporter 'import';
our @EXPORT_OK = qw(xml_encode
+ cql_quote
+ cql_target
irspy_xpath_context
- dom_add_element
- inheritance_tree);
+ modify_xml_document);
+
+use XML::LibXML;
+use XML::LibXML::XPathContext;
+
+our $IRSPY_NS = 'http://indexdata.com/irspy/1.0';
# Utility functions follow, exported for use of web UI
@@ -21,7 +27,13 @@ our @EXPORT_OK = qw(xml_encode
# Template::Plugin both roll their own. So I will do likewise. D'oh!
#
sub xml_encode {
- my ($text) = @_;
+ my($text, $fallback) = @_;
+
+ $text = $fallback if !defined $text;
+ use Carp;
+ confess "xml_encode(): text and fallback both undefined"
+ if !defined $text;
+
$text =~ s/&/&/g;
$text =~ s/</g;
$text =~ s/>/>/g;
@@ -31,43 +43,212 @@ sub xml_encode {
}
+# Quotes a term for use in a CQL query
+sub cql_quote {
+ my($term) = @_;
+
+ $term =~ s/([""\\])/\\$1/g;
+ $term = qq["$term"] if $term =~ /\s/;
+ return $term;
+}
+
+
+# Makes a CQL query that finds a specified target
+sub cql_target {
+ my($host, $port, $db) = @_;
+
+ return ("host=" . cql_quote($host) . " and " .
+ "port=" . cql_quote($port) . " and " .
+ "path=" . cql_quote($db));
+}
+
+
+# PRIVATE to irspy_namespace() and irspy_xpath_context()
+my %_namespaces = (
+ e => 'http://explain.z3950.org/dtd/2.0/',
+ i => $IRSPY_NS,
+ );
+
+
+sub irspy_namespace {
+ my($prefix) = @_;
+
+ use Carp;
+ confess "irspy_namespace(undef)" if !defined $prefix;
+ my $uri = $_namespaces{$prefix};
+ die "irspy_namespace(): no URI for namespace prefix '$prefix'"
+ if !defined $uri;
+
+ return $uri;
+}
+
+
sub irspy_xpath_context {
- my($zoom_record) = @_;
+ my($record) = @_;
- my $xml = $zoom_record->render();
+ my $xml = ref $record ? $record->render() : $record;
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 => $ZOOM::IRSpy::irspy_ns);
+ foreach my $prefix (keys %_namespaces) {
+ $xc->registerNs($prefix, $_namespaces{$prefix});
+ }
return $xc;
}
-sub dom_add_element {
- my($xc, $ppath, $element, $value, @addAfter) = @_;
+sub modify_xml_document {
+ my($xc, $fieldsByKey, $data) = @_;
- print "Adding '$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")
\n";
- my @nodes = $xc->findnodes($ppath);
- if (@nodes == 0) {
- # Oh dear, the parent node doesn't exist. We could make it,
- # but for now let's not and say we did.
- warn "no parent node '$ppath': not adding '$element'='$value'";
+ my $nchanges = 0;
+ foreach my $key (keys %$data) {
+ my $value = $data->{$key};
+ my $ref = $fieldsByKey->{$key} or die "no field '$key'";
+ my($name, $nlines, $caption, $xpath, @addAfter) = @$ref;
+ #print "Considering $key='$value' ($xpath)
\n";
+ my @nodes = $xc->findnodes($xpath);
+ if (@nodes) {
+ warn scalar(@nodes), " nodes match '$xpath'" if @nodes > 1;
+ my $node = $nodes[0];
+
+ if ($node->isa("XML::LibXML::Attr")) {
+ if ($value ne $node->getValue()) {
+ $node->setValue($value);
+ $nchanges++;
+ #print "Attr $key: '", $node->getValue(), "' -> '$value' ($xpath)
\n";
+ }
+ } elsif ($node->isa("XML::LibXML::Element")) {
+ # The contents could be any mixture of text and
+ # comments and maybe even other crud such as processing
+ # instructions. The simplest thing is just to throw it all
+ # away and start again, making a single Text node the
+ # canonical representation. But before we do that,
+ # we'll check whether the element is already
+ # canonical, to determine whether our change is a
+ # no-op.
+ my $old = "???";
+ my @children = $node->childNodes();
+ if (@children == 1) {
+ my $child = $node->firstChild();
+ if (ref $child && ref $child eq "XML::LibXML::Text") {
+ $old = $child->getData();
+ next if $value eq $old;
+ }
+ }
+
+ $node->removeChildNodes();
+ my $child = new XML::LibXML::Text($value);
+ $node->appendChild($child);
+ $nchanges++;
+ #print "Elem $key: '$old' -> '$value' ($xpath)
\n";
+ } else {
+ warn "unexpected node type $node";
+ }
+
+ } else {
+ next if !$value; # No need to create a new empty node
+ my($ppath, $selector) = $xpath =~ /(.*)\/(.*)/;
+ dom_add_node($xc, $ppath, $selector, $value, @addAfter);
+ #print "New $key ($xpath) = '$value'
\n";
+ $nchanges++;
+ }
+ }
+
+ return $nchanges;
+}
+
+
+sub dom_add_node {
+ my($xc, $ppath, $selector, $value, @addAfter) = @_;
+
+ #print "Adding $selector='$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")
\n";
+ my $node = find_or_make_node($xc, $ppath, 0);
+ die "couldn't find or make node '$node'" if !defined $node;
+
+ my $is_attr = ($selector =~ s/^@//);
+ my(undef, $prefix, $simpleSel) = $selector =~ /((.*?):)?(.*)/;
+ #warn "selector='$selector', prefix='$prefix', simpleSel='$simpleSel'";
+ if ($is_attr) {
+ if (defined $prefix) {
+ ### This seems to no-op (thank, DOM!) but I have have no
+ # idea, and it's not needed for IRSpy, so I am not going
+ # to debug it now.
+ $node->setAttributeNS(irspy_namespace($prefix),
+ $simpleSel, $value);
+ } else {
+ $node->setAttribute($simpleSel, $value);
+ }
return;
}
- warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1;
- my $node = $nodes[0];
+ my $new = new XML::LibXML::Element($simpleSel);
+ $new->setNamespace(irspy_namespace($prefix), $prefix)
+ if defined $prefix;
- if (1) {
+ $new->appendText($value);
+ foreach my $predecessor (reverse @addAfter) {
+ my($child) = $xc->findnodes($predecessor, $node);
+ if (defined $child) {
+ $node->insertAfter($new, $child);
+ #warn "Added after '$predecessor'";
+ return;
+ }
+ }
+
+ # Didn't find any of the nodes that are supposed to precede the
+ # new one, so we need to insert the new node as the first of the
+ # parent's children. However *sigh* there is no prependChild()
+ # analogous to appendChild(), so we have to go the long way round.
+ my @children = $node->childNodes();
+ if (@children) {
+ $node->insertBefore($new, $children[0]);
+ #warn "Added new first child";
+ } else {
+ $node->appendChild($new);
+ #warn "Added new only child";
+ }
+
+ if (0) {
my $text = xml_encode(inheritance_tree($xc));
- $text =~ s/\n/
$1/sg;
+ $text =~ s/\n/
$&/sg;
print "
$text\n"; } } +sub find_or_make_node { + my($xc, $path, $recursion_level) = @_; + + die "deep recursion in find_or_make_node($path)" + if $recursion_level == 10; + $path = "." if $path eq ""; + + my @nodes = $xc->findnodes($path); + if (@nodes == 0) { + # Oh dear, the parent node doesn't exist. We could make it, + my(undef, $ppath, $element) = $path =~ /((.*)\/)?(.*)/; + $ppath = "" if !defined $ppath; + #warn "path='$path', ppath='$ppath', element='$element'"; + #warn "no node '$path': making it"; + my $parent = find_or_make_node($xc, $ppath, $recursion_level-1); + + my(undef, $prefix, $nsElem) = $element =~ /((.*?):)?(.*)/; + #warn "element='$element', prefix='$prefix', nsElem='$nsElem'"; + my $new = new XML::LibXML::Element($nsElem); + if (defined $prefix) { + #warn "setNamespace($prefix)"; + $new->setNamespace(irspy_namespace($prefix), $prefix); + } + + $parent->appendChild($new); + return $new; + } + warn scalar(@nodes), " nodes match parent '$path'" if @nodes > 1; + return $nodes[0]; +} + + sub inheritance_tree { my($type, $level) = @_; $level = 0 if !defined $level;