X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=9ead6b30888953bab381a06ad8540a42d9a5e93e;hb=00450608fbb1abc4bd5e75d269ff0c87f87b9b48;hp=eeffccced7a12a29bb0fc2e363d1f393c525bf8e;hpb=70f35e9d28e4b25f763baee0602e2eac25264ebf;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index eeffccc..9ead6b3 100644
--- 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_raw=" . cql_quote($id);
 }
 
 
@@ -828,7 +829,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 +842,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)$/i;
+    }
+
     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 =~ /^\s+|\s+$/;
     }
 
     if ($tests{'hosturl'}) {