X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=68e23be370c6c3019361f43155a093c82ab4c3c6;hb=31ab2c939eb9c4bba6c703b733c39f74cc55c541;hp=8efcd7cbdec336bcf53ee673e47328a9f04ed946;hpb=e965df593271067405f0c3a7496ab5fe1c8e4d26;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 8efcd7c..68e23be 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.10 2006-11-13 16:47:57 mike Exp $
+# $Id: Utils.pm,v 1.15 2006-11-16 17:18:14 mike Exp $
 
 package ZOOM::IRSpy::Utils;
 
@@ -8,9 +8,10 @@ use warnings;
 
 use Exporter 'import';
 our @EXPORT_OK = qw(xml_encode 
+		    cql_quote
+		    cql_target
 		    irspy_xpath_context
-		    modify_xml_document
-		    inheritance_tree);
+		    modify_xml_document);
 
 use XML::LibXML;
 use XML::LibXML::XPathContext;
@@ -26,7 +27,13 @@ our $IRSPY_NS = 'http://indexdata.com/irspy/1.0';
 # 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/</&lt;/g;
     $text =~ s/>/&gt;/g;
@@ -36,6 +43,26 @@ 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/',
@@ -46,6 +73,8 @@ my %_namespaces = (
 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;
@@ -119,8 +148,8 @@ sub modify_xml_document {
 
 	} else {
 	    next if !$value; # No need to create a new empty node
-	    my($ppath, $element) = $xpath =~ /(.*)\/(.*)/;
-	    dom_add_element($xc, $ppath, $element, $value, @addAfter);
+	    my($ppath, $selector) = $xpath =~ /(.*)\/(.*)/;
+	    dom_add_node($xc, $ppath, $selector, $value, @addAfter);
 	    #print "New $key ($xpath) = '$value'<br/>\n";
 	    $nchanges++;
 	}
@@ -130,32 +159,39 @@ sub modify_xml_document {
 }
 
 
-sub dom_add_element {
-    my($xc, $ppath, $element, $value, @addAfter) = @_;
+sub dom_add_node {
+    my($xc, $ppath, $selector, $value, @addAfter) = @_;
 
-    #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,
-	# but for now let's not and say we did.
-	###
-	warn "no parent node '$ppath': not adding '$element'='$value'";
+    #print "Adding $selector='$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")<br/>\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(undef, $prefix, $nsElem) = $element =~ /((.*?):)?(.*)/;
-    my $new = new XML::LibXML::Element($nsElem);
+    my $new = new XML::LibXML::Element($simpleSel);
     $new->setNamespace(irspy_namespace($prefix), $prefix)
-	if $prefix ne "";
+	if defined $prefix;
 
     $new->appendText($value);
     foreach my $predecessor (reverse @addAfter) {
 	my($child) = $xc->findnodes($predecessor, $node);
 	if (defined $child) {
 	    $node->insertAfter($new, $child);
-	    #print "Added after '$predecessor'<br/>\n";
+	    #warn "Added after '$predecessor'";
 	    return;
 	}
     }
@@ -167,10 +203,10 @@ sub dom_add_element {
     my @children = $node->childNodes();
     if (@children) {
 	$node->insertBefore($new, $children[0]);
-	#print "Added new first child<br/>\n";
+	#warn "Added new first child";
     } else {
 	$node->appendChild($new);
-	#print "Added new only child<br/>\n";
+	#warn "Added new only child";
     }
 
     if (0) {
@@ -181,6 +217,38 @@ sub dom_add_element {
 }
 
 
+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;