projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add irspy_namespace()
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy
/
Utils.pm
diff --git
a/lib/ZOOM/IRSpy/Utils.pm
b/lib/ZOOM/IRSpy/Utils.pm
index
e232045
..
13ef7ae
100644
(file)
--- a/
lib/ZOOM/IRSpy/Utils.pm
+++ b/
lib/ZOOM/IRSpy/Utils.pm
@@
-1,4
+1,4
@@
-# $Id: Utils.pm,v 1.7 2006-11-07 17:45:37 mike Exp $
+# $Id: Utils.pm,v 1.9 2006-11-09 16:09:35 mike Exp $
package ZOOM::IRSpy::Utils;
package ZOOM::IRSpy::Utils;
@@
-36,16
+36,35
@@
sub xml_encode {
}
}
+# 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) = @_;
+
+ my $uri = $_namespaces{$prefix};
+ die "irspy_namespace(): no URI for namespace prefix '$prefix'"
+ if !defined $uri;
+
+ return $uri;
+}
+
+
sub irspy_xpath_context {
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);
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);
+ foreach my $prefix (keys %_namespaces) {
+ $xc->registerNs($prefix, $_namespaces{$prefix});
+ }
return $xc;
}
return $xc;
}
@@
-68,7
+87,7
@@
sub modify_xml_document {
if ($value ne $node->getValue()) {
$node->setValue($value);
$nchanges++;
if ($value ne $node->getValue()) {
$node->setValue($value);
$nchanges++;
- print "Attr $key: '", $node->getValue(), "' -> '$value' ($xpath)<br/>\n";
+ #print "Attr $key: '", $node->getValue(), "' -> '$value' ($xpath)<br/>\n";
}
} elsif ($node->isa("XML::LibXML::Element")) {
# The contents could be any mixture of text and
}
} elsif ($node->isa("XML::LibXML::Element")) {
# The contents could be any mixture of text and
@@
-93,7
+112,7
@@
sub modify_xml_document {
my $child = new XML::LibXML::Text($value);
$node->appendChild($child);
$nchanges++;
my $child = new XML::LibXML::Text($value);
$node->appendChild($child);
$nchanges++;
- print "Elem $key: '$old' -> '$value' ($xpath)<br/>\n";
+ #print "Elem $key: '$old' -> '$value' ($xpath)<br/>\n";
} else {
warn "unexpected node type $node";
}
} else {
warn "unexpected node type $node";
}
@@
-102,7
+121,7
@@
sub modify_xml_document {
next if !$value; # No need to create a new empty node
my($ppath, $element) = $xpath =~ /(.*)\/(.*)/;
dom_add_element($xc, $ppath, $element, $value, @addAfter);
next if !$value; # No need to create a new empty node
my($ppath, $element) = $xpath =~ /(.*)\/(.*)/;
dom_add_element($xc, $ppath, $element, $value, @addAfter);
- print "Add $key ($xpath) = '$value'<br/>\n";
+ #print "New $key ($xpath) = '$value'<br/>\n";
$nchanges++;
}
}
$nchanges++;
}
}
@@
-114,7
+133,7
@@
sub modify_xml_document {
sub dom_add_element {
my($xc, $ppath, $element, $value, @addAfter) = @_;
sub dom_add_element {
my($xc, $ppath, $element, $value, @addAfter) = @_;
- print "Adding '$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")<br/>\n";
+ #print "Adding $element='$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")<br/>\n";
my @nodes = $xc->findnodes($ppath);
if (@nodes == 0) {
# Oh dear, the parent node doesn't exist. We could make it,
my @nodes = $xc->findnodes($ppath);
if (@nodes == 0) {
# Oh dear, the parent node doesn't exist. We could make it,
@@
-125,12
+144,17
@@
sub dom_add_element {
warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1;
my $node = $nodes[0];
warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1;
my $node = $nodes[0];
- my $new = new XML::LibXML::Text($value);
+ my(undef, $prefix, $nsElem) = $element =~ /((.*?):)?(.*)/;
+ my $new = new XML::LibXML::Element($nsElem);
+ $new->setNamespace(irspy_namespace($prefix), $prefix)
+ if $prefix ne "";
+
+ $new->appendText($value);
foreach my $predecessor (reverse @addAfter) {
my($child) = $xc->findnodes($predecessor, $node);
if (defined $child) {
$node->insertAfter($new, $child);
foreach my $predecessor (reverse @addAfter) {
my($child) = $xc->findnodes($predecessor, $node);
if (defined $child) {
$node->insertAfter($new, $child);
- print "Added after '$predecessor'\n";
+ #print "Added after '$predecessor'<br/>\n";
return;
}
}
return;
}
}
@@
-142,10
+166,10
@@
sub dom_add_element {
my @children = $node->childNodes();
if (@children) {
$node->insertBefore($new, $children[0]);
my @children = $node->childNodes();
if (@children) {
$node->insertBefore($new, $children[0]);
- print "Added new first child\n";
+ #print "Added new first child<br/>\n";
} else {
$node->appendChild($new);
} else {
$node->appendChild($new);
- print "Added new only child\n";
+ #print "Added new only child<br/>\n";
}
if (0) {
}
if (0) {