X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=d5bc7b47208ec6ed5fc30fe14019e1310d6d022f;hp=09f6b8f1869829e4e1dbf41bc4e07b3caf9116a0;hb=ee1d0970cbfa0228ee4a4d55bca480af4a2b35a4;hpb=9594f06ac28b70d81fd240b209ca88b438f78507

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 09f6b8f..d5bc7b4 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.29 2007-05-01 15:29:36 mike Exp $
+# $Id: Utils.pm,v 1.37 2007-12-12 11:02:37 mike Exp $
 
 package ZOOM::IRSpy::Utils;
 
@@ -7,7 +7,8 @@ use strict;
 use warnings;
 
 use Exporter 'import';
-our @EXPORT_OK = qw(isodate
+our @EXPORT_OK = qw(utf8param
+		    isodate
 		    xml_encode 
 		    cql_quote
 		    cql_target
@@ -21,11 +22,26 @@ our @EXPORT_OK = qw(isodate
 
 use XML::LibXML;
 use XML::LibXML::XPathContext;
+use Encode;
+use Encode qw(is_utf8);
+
 
 our $IRSPY_NS = 'http://indexdata.com/irspy/1.0';
 
 
 # Utility functions follow, exported for use of web UI
+sub utf8param {
+    my($r, $key, $value) = @_;
+    die "utf8param() called with value '$value'" if defined $value;
+
+    my $raw = $r->param($key);
+    return undef if !defined $raw;
+    my $cooked = decode_utf8($raw);
+    warn "converted '$raw' to '", $cooked, "'\n" if $cooked ne $raw;
+    return $cooked;
+}
+
+
 sub isodate {
     my($time) = @_;
 
@@ -70,7 +86,7 @@ sub xml_encode {
 sub cql_quote {
     my($term) = @_;
 
-    $term =~ s/([""\\])/\\$1/g;
+    $term =~ s/([""\\*?])/\\$1/g;
     $term = qq["$term"] if $term =~ /[\s""\/]/;
     return $term;
 }
@@ -189,6 +205,9 @@ sub irspy_identifier2target {
 sub _irspy_identifier2target {
     my($id) = @_;
 
+    confess "_irspy_identifier2target(): id is undefined"
+	if !defined $id;
+
     my($protocol, $target) = ($id =~ /(.*?):(.*)/);
     if (uc($protocol) eq "Z39.50") {
 	return "tcp:$target";
@@ -198,7 +217,7 @@ sub _irspy_identifier2target {
 	return "sru=srw,http:$target";
     }
 
-    warn "unrecognised protocol '$protocol' in ID $id";
+    warn "_irspy_identifier2target($id): unrecognised protocol '$protocol'";
     return $target;
 }
 
@@ -232,21 +251,22 @@ sub modify_xml_document {
 		# we'll check whether the element is already
 		# canonical, to determine whether our change is a
 		# no-op.
-		my $old = "???";
+		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;
+			#print STDERR "child='$child', old=", _renderchars($old), "\n" if $key eq "title";
 		    }
 		}
+		next if $value eq $old;
 
 		$node->removeChildNodes();
 		my $child = new XML::LibXML::Text($value);
 		$node->appendChild($child);
 		push @changes, $ref;
-		#print "Elem $key: '$old' -> '$value' ($xpath)<br/>\n";
+		#print STDERR "Elem $key ($xpath): ", _renderchars($old), " -> '", _renderchars($value), "\n";
 	    } else {
 		warn "unexpected node type $node";
 	    }
@@ -264,6 +284,13 @@ sub modify_xml_document {
 }
 
 
+sub _renderchars {
+    my($text) = @_;
+
+    return "'" . $text . "'", " (", join(" ", map {ord($_)} split //, $text), "), is_utf8=" , is_utf8($text);
+}
+
+
 sub dom_add_node {
     my($xc, $ppath, $selector, $value, @addAfter) = @_;
 
@@ -375,7 +402,7 @@ sub inheritance_tree {
 # This function is made available in xslt using the register_function call
 sub xslt_strcmp {
     my ($arg1, $arg2) = @_;
-    return ($arg1->to_literal()) cmp ($arg2->to_literal());
+    return "$arg1" cmp "$arg2";
 }