From c46ad5836a9a08d7da8df72a3661eaca376d3020 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Wed, 28 Apr 2010 17:30:22 +0200 Subject: [PATCH] add more tests for validate_record() --- lib/ZOOM/IRSpy/Utils.pm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm index eeffccc..856e602 100644 --- a/lib/ZOOM/IRSpy/Utils.pm +++ b/lib/ZOOM/IRSpy/Utils.pm @@ -828,7 +828,7 @@ sub validate_record { 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 ); @@ -841,18 +841,27 @@ sub validate_record { 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; + if ($tests{'protocol'}) { + push(@errors, 'protocol number is not valid') if $protocol !~ /^(z39\.50|sru|srw|tcp)$/; + } + 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'}) { - 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'}) { - 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 ne trimField($dbname); } if ($tests{'hosturl'}) { -- 1.7.10.4