X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=75a7bf654c3952cfd5c1adc591dae3ef8377d484;hb=393f5d3e8ba6ee9d8e15174914c060d6ff0f0c9d;hp=e567eff86ca9c4e90398d8ff15d410f838361360;hpb=60aae50aef740c7bce231591298d5f544de1ce51;p=irspy-moved-to-github.git diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm index e567eff..75a7bf6 100644 --- a/lib/ZOOM/IRSpy/Utils.pm +++ b/lib/ZOOM/IRSpy/Utils.pm @@ -1,4 +1,4 @@ -# $Id: Utils.pm,v 1.31 2007-05-03 12:41:58 mike Exp $ +# $Id: Utils.pm,v 1.34 2007-06-27 11:08:08 mike Exp $ package ZOOM::IRSpy::Utils; @@ -35,6 +35,7 @@ sub utf8param { 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; @@ -85,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; } @@ -253,8 +254,7 @@ sub modify_xml_document { 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"; + #print STDERR "child='$child', old=", _renderchars($old), "\n" if $key eq "title"; } } next if $value eq $old; @@ -263,7 +263,7 @@ sub modify_xml_document { my $child = new XML::LibXML::Text($value); $node->appendChild($child); push @changes, $ref; - print STDERR "Elem $key ($xpath): ", _renderchars($old), " -> '", _renderchars($value), "\n"; + #print STDERR "Elem $key ($xpath): ", _renderchars($old), " -> '", _renderchars($value), "\n"; } else { warn "unexpected node type $node"; }