projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Constructor fails politely (warns and returns undef) if the registry
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy
/
Utils.pm
diff --git
a/lib/ZOOM/IRSpy/Utils.pm
b/lib/ZOOM/IRSpy/Utils.pm
index
2dbbe13
..
d5bc7b4
100644
(file)
--- a/
lib/ZOOM/IRSpy/Utils.pm
+++ b/
lib/ZOOM/IRSpy/Utils.pm
@@
-1,4
+1,4
@@
-# $Id: Utils.pm,v 1.33 2007-06-27 10:44:57 mike Exp $
+# $Id: Utils.pm,v 1.37 2007-12-12 11:02:37 mike Exp $
package ZOOM::IRSpy::Utils;
package ZOOM::IRSpy::Utils;
@@
-205,6
+205,9
@@
sub irspy_identifier2target {
sub _irspy_identifier2target {
my($id) = @_;
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($protocol, $target) = ($id =~ /(.*?):(.*)/);
if (uc($protocol) eq "Z39.50") {
return "tcp:$target";
@@
-214,7
+217,7
@@
sub _irspy_identifier2target {
return "sru=srw,http:$target";
}
return "sru=srw,http:$target";
}
- warn "unrecognised protocol '$protocol' in ID $id";
+ warn "_irspy_identifier2target($id): unrecognised protocol '$protocol'";
return $target;
}
return $target;
}
@@
-254,8
+257,7
@@
sub modify_xml_document {
my $child = $node->firstChild();
if (ref $child && ref $child eq "XML::LibXML::Text") {
$old = $child->getData();
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;
}
}
next if $value eq $old;
@@
-264,7
+266,7
@@
sub modify_xml_document {
my $child = new XML::LibXML::Text($value);
$node->appendChild($child);
push @changes, $ref;
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";
}
} else {
warn "unexpected node type $node";
}
@@
-400,7
+402,7
@@
sub inheritance_tree {
# This function is made available in xslt using the register_function call
sub xslt_strcmp {
my ($arg1, $arg2) = @_;
# 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";
}
}