X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=5db0e331c7e4dbad71fde3c70649f83b6084e908;hb=d7d317a3020e922db1a9e2370d4e61e8d325e81c;hp=ad98b155768f642387f8cfd8f23b5b12bec94e56;hpb=10d907bef1d484d461177f4701080c830477ae66;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index ad98b15..5db0e33 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.21 2006-12-18 15:34:54 mike Exp $
+# $Id: Utils.pm,v 1.26 2007-03-19 18:51:03 mike Exp $
 
 package ZOOM::IRSpy::Utils;
 
@@ -13,7 +13,8 @@ our @EXPORT_OK = qw(isodate
 		    cql_target
 		    irspy_xpath_context
 		    modify_xml_document
-		    bib1_access_point);
+		    bib1_access_point
+		    render_record);
 
 use XML::LibXML;
 use XML::LibXML::XPathContext;
@@ -67,18 +68,18 @@ sub cql_quote {
     my($term) = @_;
 
     $term =~ s/([""\\])/\\$1/g;
-    $term = qq["$term"] if $term =~ /\s/;
+    $term = qq["$term"] if $term =~ /[\s""\/]/;
     return $term;
 }
 
 
-# Makes a CQL query that finds a specified target
+# Makes a CQL query that finds a specified target.  Arguments may be
+# either an ID alone, or a (host, port, db) triple.
 sub cql_target {
     my($host, $port, $db) = @_;
 
-    return ("host=" . cql_quote($host) . " and " .
-	    "port=" . cql_quote($port) . " and " .
-	    "path=" . cql_quote($db));
+    $host .= ":$port/$db" if defined $port;
+    return "rec.id=" . cql_quote($host);
 }
 
 
@@ -105,10 +106,19 @@ sub irspy_namespace {
 sub irspy_xpath_context {
     my($record) = @_;
 
-    my $xml = ref $record ? $record->render() : $record;
-    my $parser = new XML::LibXML();
-    my $doc = $parser->parse_string($xml);
-    my $root = $doc->getDocumentElement();
+    if (ref $record && $record->isa("ZOOM::Record")) {
+	$record = $record->render();
+    }
+
+    my $root;
+    if (ref $record) {
+	$root = $record;
+    } else {
+	my $parser = new XML::LibXML();
+	my $doc = $parser->parse_string($record);
+	$root = $doc->getDocumentElement();
+    }
+
     my $xc = XML::LibXML::XPathContext->new($root);
     foreach my $prefix (keys %_namespaces) {
 	$xc->registerNs($prefix, $_namespaces{$prefix});
@@ -592,4 +602,18 @@ sub bib1_access_point {
 }
 
 
+sub render_record {
+    my($rs, $which, $elementSetName) = @_;
+
+    # There is a slight race condition here on the element-set name,
+    # but it shouldn't be a problem as this is (currently) only called
+    # from parts of the program that run single-threaded.
+    my $old = $rs->option(elementSetName => $elementSetName);
+    my $rec = $rs->record($which);
+    $rs->option(elementSetName => $old);
+
+    return $rec->render();
+}
+
+
 1;