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
search_complete() gets only the name out of @$ref.
[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
eeffccc
..
9ead6b3
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);
}
}
@@
-828,7
+829,7
@@
sub validate_record {
my $rec = shift;
my %args = @_;
my $rec = shift;
my %args = @_;
- my %required = map { $_ => 1 } qw/port host database/;
+ my %required = map { $_ => 1 } qw/port host database protocol/;
my %optional = map { $_ => 1 } qw/country type hosturl contact language/;
my %tests = ( %required, %args );
my %optional = map { $_ => 1 } qw/country type hosturl contact language/;
my %tests = ( %required, %args );
@@
-841,18
+842,27
@@
sub validate_record {
my $id = irspy_make_identifier($protocol, $host, $port, $dbname);
my $id = irspy_make_identifier($protocol, $host, $port, $dbname);
+ if ($protocol =~ /\s+$/ || $dbname =~ /\s+$/) {
+ warn "xxx: $protocol:$host:$port:$dbname: whitespaces\n";
+ }
+
my @errors = $id;
my @errors = $id;
+ if ($tests{'protocol'}) {
+ push(@errors, 'protocol number is not valid') if $protocol !~ /^(z39\.50|sru|srw|tcp)$/i;
+ }
+
if ($tests{'port'}) {
if ($tests{'port'}) {
- push(@errors, 'This port number is not valid') if $port !~ /^\d+$/;
+ push(@errors, 'port number is not valid') if $port !~ /^\d+$/;
}
if ($tests{'host'}) {
}
if ($tests{'host'}) {
- push(@errors, 'This host name is not valid') if $host !~ /^[0-9a-z]+[0-9a-z\.\-]*\.[0-9a-z]+$/i;
+ push(@errors, 'host name is not valid') if $host !~ /^[0-9a-z]+[0-9a-z\.\-]*\.[0-9a-z]+$/i;
}
if ($tests{'database'}) {
}
if ($tests{'database'}) {
- push(@errors, 'This database name is not valid') if $dbname !~ /^[\w_\-\.]+$/i;
+ push(@errors, 'database name is not valid') if $dbname =~ m,/,i;
+ push(@errors, 'database has trailing spaces') if $dbname =~ /^\s+|\s+$/;
}
if ($tests{'hosturl'}) {
}
if ($tests{'hosturl'}) {