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
Reorder record-syntaxes probed to reduce likelihood of early failure.
[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
856e602
..
475e9de
100644
(file)
--- a/
lib/ZOOM/IRSpy/Utils.pm
+++ b/
lib/ZOOM/IRSpy/Utils.pm
@@
-181,6
+181,7
@@
sub cql_target {
}
return "rec.id=" . cql_quote($id);
}
return "rec.id=" . cql_quote($id);
+ #return "rec.id_raw=" . cql_quote($id);
}
}
@@
-284,13
+285,14
@@
sub _irspy_identifier2target {
confess "_irspy_identifier2target(): id is undefined"
if !defined $id;
confess "_irspy_identifier2target(): id is undefined"
if !defined $id;
- my($protocol, $target) = ($id =~ /(.*?):(.*)/);
+ my($prefix, $protocol, $target) = ($id =~ /([^:]*,)?(.*?):(.*)/);
+ $prefix ||= "";
if (uc($protocol) eq "Z39.50" || uc($protocol) eq "TCP") {
if (uc($protocol) eq "Z39.50" || uc($protocol) eq "TCP") {
- return "tcp:$target";
+ return "${prefix}tcp:$target";
} elsif (uc($protocol) eq "SRU") {
} elsif (uc($protocol) eq "SRU") {
- return "sru=get,http:$target";
+ return "${prefix}sru=get,http:$target";
} elsif (uc($protocol) eq "SRW") {
} elsif (uc($protocol) eq "SRW") {
- return "sru=srw,http:$target";
+ return "${prefix}sru=srw,http:$target";
}
warn "_irspy_identifier2target($id): unrecognised protocol '$protocol'";
}
warn "_irspy_identifier2target($id): unrecognised protocol '$protocol'";
@@
-848,7
+850,7
@@
sub validate_record {
my @errors = $id;
if ($tests{'protocol'}) {
my @errors = $id;
if ($tests{'protocol'}) {
- push(@errors, 'protocol number is not valid') if $protocol !~ /^(z39\.50|sru|srw|tcp)$/;
+ push(@errors, 'protocol number is not valid') if $protocol !~ /^(z39\.50|sru|srw|tcp)$/i;
}
if ($tests{'port'}) {
}
if ($tests{'port'}) {
@@
-861,7
+863,7
@@
sub validate_record {
if ($tests{'database'}) {
push(@errors, 'database name is not valid') if $dbname =~ m,/,i;
if ($tests{'database'}) {
push(@errors, 'database name is not valid') if $dbname =~ m,/,i;
- push(@errors, 'database has trailing spaces') if $dbname ne trimField($dbname);
+ push(@errors, 'database has trailing spaces') if $dbname =~ /^\s+|\s+$/;
}
if ($tests{'hosturl'}) {
}
if ($tests{'hosturl'}) {