-%# $Id: edit.mc,v 1.29 2007-03-29 16:19:39 mike Exp $
+%# $Id: edit.mc,v 1.39 2008-10-29 11:04:44 mike Exp $
<%args>
$op
-$id => undef
+$id => undef ### should be extracted using utf8param()
$update => undef
</%args>
<%doc>
my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1", 0,
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");
+
+if ((!defined $port || $port eq "") &&
+ (defined $protocol && $protocol ne "")) {
+ # Port-guessing based on defaults for each protocol
+ $port = $protocol eq "Z39.50" ? 210 : 80;
+ warn "guessed port $port";
+ $r->param(port => $port);
+}
+
+my $newid;
+if (defined $protocol && $protocol ne "" &&
+ defined $host && $host ne "" &&
+ defined $port && $port ne "" &&
+ defined $dbname && $dbname ne "") {
+ $newid = irspy_make_identifier($protocol, $host, $port, $dbname);
+}
+
my $rec = '<explain xmlns="http://explain.z3950.org/dtd/2.0/"/>';
-if (defined $id && ($op ne "copy" || !$update)) {
- # Existing record
- my $query = cql_target($id);
- my $rs = $conn->search(new ZOOM::Query::CQL($query));
- if ($rs->size() > 0) {
- $rec = $rs->record(0);
- } else {
- ### Is this an error? I don't think the UI will ever provoke it
- print qq[<p class="error">(New ID specified.)</p>\n];
- $id = undef;
- }
-} else {
- # No ID supplied -- this is a brand new record
- my $host = $r->param("host");
- my $port = $r->param("port");
- my $dbname = $r->param("dbname");
- if (!defined $host || $host eq "" ||
- !defined $port || $port eq "" ||
- !defined $dbname || $dbname eq "") {
+if (!defined $id) {
+ if (!$update) {
+ # About to enter data for a new record
+ # Nothing to do at this stage
+ } elsif (!defined $newid) {
+ # Tried to create new record but data is insufficient
print qq[<p class="error">
-You must specify host, port and database name.</p>\n] if $update;
+ Please specify protocol, host, port and database name.</p>\n];
undef $update;
+ } elsif ($host !~ /^\w+\.[\w.]*\w$/i) {
+ print qq[<p class="error">
+ This host name is not valid.</p>\n];
+ undef $update;
+ sleep 25;
+ } elsif ($port !~ /^\d*$/i) {
+ print qq[<p class="error">
+ This port number is not valid.</p>\n];
+ undef $update;
+ sleep 25;
} else {
- my $query = cql_target($host, $port, $dbname);
- my $rs = $conn->search(new ZOOM::Query::CQL($query));
+ # Creating new record, all necessary data is present. Check
+ # that the new record is not a duplicate of an existing one.
+ my $rs = $conn->search(new ZOOM::Query::CQL(cql_target($newid)));
if ($rs->size() > 0) {
- my $fakeid = xml_encode(uri_escape("$host:$port/$dbname"));
+ my $qnewid = xml_encode(uri_escape($newid));
print qq[<p class="error">
-There is already
-<a href='?op=edit&id=$fakeid'>a record</a>
-for this host, port and database name.
-</p>\n];
+ There is already
+ <a href='?op=edit&id=$newid'>a record</a>
+ for this protocol, host, port and database name.
+ </p>\n];
undef $update;
}
}
+} else {
+ # assert(defined $id);
+ # Copying or editing an existing record: fetch it for editing
+ my $query = cql_target($id);
+ my $rs = $conn->search(new ZOOM::Query::CQL($query));
+ if ($rs->size() > 0) {
+ $rec = $rs->record(0);
+ } else {
+ ### Is this an error? I don't think the UI will ever provoke it
+ print qq[<p class="error">(New ID specified.)</p>\n];
+ $id = undef;
+ }
}
my $xc = irspy_xpath_context($rec);
qw() ],
[ country => $m->comp("country-list.mc"),
"Country", "i:status/i:country" ],
- [ protocol => [ qw(Z39.50 SRW SRU SRW/U) ],
+ [ protocol => [ qw(Z39.50 SRW SRU) ],
"Protocol", "e:serverInfo/\@protocol" ],
[ host => 0, "Host", "e:serverInfo/e:host" ],
[ port => 0, "Port", "e:serverInfo/e:port" ],
my %data;
foreach my $key ($r->param()) {
next if grep { $key eq $_ } qw(op id update);
- $data{$key} = $r->param($key);
+ $data{$key} = utf8param($r, $key);
}
my @changedFields = modify_xml_document($xc, \%fieldsByKey, \%data);
if ($update && @changedFields) {
"e:metaInfo/e:dateModified" ] },
{ dateModified => isodate(time()) });
die "Didn't set dateModified!" if !@x;
- ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode(), $id);
+ ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode(),
+ $op eq "edit" ? $id : undef);
}
</%perl>
Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>:
<% join(", ", map { xml_encode($_->[2]) } @changedFields) %>.
</p>
+% return if $op eq "new";
% }
+ <p>
+ Although anyone is allowed to add a new target, please note that
+ <b>you will not be able to edit the newly added target unless you
+ have administrator privileges</b>. So please be sure that the
+ details are correct before submitting them.
+ </p>
<form method="get" action="">
<table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
<%perl>
<tr>
<td align="right" colspan="2">
<input type="submit" name="update" value="Update"/>
+% $op = "edit" if $op eq "new" && defined $update;
<input type="hidden" name="op" value="<% xml_encode($op) %>"/>
+% $id = $newid if defined $newid;
% if (defined $id) {
<input type="hidden" name="id" value="<% xml_encode($id) %>"/>
% }
projects / irspy-moved-to-github.git / blobdiff