user => "admin", password => "fruitbat",
elementSetName => "zeerex");
-my $protocol = utf8param($r, "protocol");
-my $host = utf8param($r, "host");
-my $port = utf8param($r, "port");
-my $dbname = utf8param($r, "dbname");
+my $protocol = utf8paramTrim($r, "protocol");
+my $host = utf8paramTrim($r, "host");
+my $port = utf8paramTrim($r, "port");
+my $dbname = utf8paramTrim($r, "dbname");
+my $title = utf8paramTrim($r, "title");
if ((!defined $port || $port eq "") &&
(defined $protocol && $protocol ne "")) {
if (defined $protocol && $protocol ne "" &&
defined $host && $host ne "" &&
defined $port && $port ne "" &&
+ defined $title && $title ne "" &&
defined $dbname && $dbname ne "") {
$newid = irspy_make_identifier($protocol, $host, $port, $dbname);
}
} elsif (!defined $newid) {
# Tried to create new record but data is insufficient
print qq[<p class="error">
- Please specify protocol, host, port and database name.</p>\n];
+ Please specify name, protocol, host, port and database name.</p>\n];
undef $update;
- } elsif ($host !~ /^\w+\.[\w.]*\w$/i) {
+ } elsif ($host !~ /^[\w-]+\.[\w.-]*\w$/i) {
print qq[<p class="error">
This host name is not valid.</p>\n];
undef $update;
[ port => 0, "Port", "e:serverInfo/e:port" ],
[ dbname => 0, "Database Name", "e:serverInfo/e:database",
qw(e:host e:port) ],
+ [ udb => 0, "Access Name (Unique DB)", "e:databaseInfo/i:udb", qw(e:host e:port e:database) ],
[ type => $m->comp("libtype-list.mc"),
"Type of Library", "i:status/i:libraryType" ],
[ username => 0, "Username (if needed)", "e:serverInfo/e:authentication/e:user",
qw() ],
[ password => 0, "Password (if needed)", "e:serverInfo/e:authentication/e:password",
qw(e:user) ],
+ [ proxy => 0, "Proxy (if needed)", "e:serverInfo/e:authentication/e:proxy",
+ qw(e:password) ],
[ description => 5, "Description", "e:databaseInfo/e:description",
qw(e:title) ],
[ author => 0, "Author", "e:databaseInfo/e:author",
qw(e:title e:description) ],
[ subjects => 2, "Subjects", "e:databaseInfo/e:subjects",
qw(e:title e:description) ],
+ [ disabled => [ qw(0 1) ],
+ "Target Test Disabled", "i:status/i:disabled" ],
);
# Update record with submitted data