-# $Id: Utils.pm,v 1.30 2007-05-02 13:52:54 mike Exp $
+# $Id: Utils.pm,v 1.36 2007-09-20 10:12:19 mike Exp $
package ZOOM::IRSpy::Utils;
use warnings;
use Exporter 'import';
-our @EXPORT_OK = qw(isodate
+our @EXPORT_OK = qw(utf8param
+ isodate
xml_encode
cql_quote
cql_target
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) = @_;
sub cql_quote {
my($term) = @_;
- $term =~ s/([""\\])/\\$1/g;
+ $term =~ s/([""\\*?])/\\$1/g;
$term = qq["$term"] if $term =~ /[\s""\/]/;
return $term;
}
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";
my $child = $node->firstChild();
if (ref $child && ref $child eq "XML::LibXML::Text") {
$old = $child->getData();
+ #print STDERR "child='$child', old=", _renderchars($old), "\n" if $key eq "title";
}
}
next if $value eq $old;
my $child = new XML::LibXML::Text($value);
$node->appendChild($child);
push @changes, $ref;
- print STDERR "Elem $key: '$old' -> '$value' ($xpath)<br/>\n";
+ #print STDERR "Elem $key ($xpath): ", _renderchars($old), " -> '", _renderchars($value), "\n";
} else {
warn "unexpected node type $node";
}
}
+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) = @_;
# 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";
}