X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=95686a176d80cd6908fc7894781df500a09cfd06;hb=0bed5b77c0f02b285b1edf5b11ce57459aa02740;hp=ca1213a9a66423973efa666189701a5d258ff3b0;hpb=96fdcac47776fe4a597004d640f6bce78bb5cc09;p=irspy-moved-to-github.git
diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index ca1213a..95686a1 100644
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,7 +1,7 @@
-%# $Id: edit.mc,v 1.29 2007-03-29 16:19:39 mike Exp $
+%# $Id: edit.mc,v 1.37 2007-08-23 14:29:18 mike Exp $
<%args>
$op
-$id => undef
+$id => undef ### should be extracted using utf8param()
$update => undef
%args>
<%doc>
@@ -35,43 +35,73 @@ die "op != new but id undefined" if $op ne "new" && !defined $id;
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 = '
(New ID specified.)
\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[-You must specify host, port and database name.
\n] if $update; + Please specify protocol, host, port and database name.\n]; + undef $update; + } elsif ($host !~ /^\w+\.[\w.]*\w$/i) { + print qq[+ This host name is not valid.
\n]; + undef $update; + } elsif ($port !~ /^\d*$/i) { + print qq[+ This port number is not valid.
\n]; undef $update; } 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[-There is already -a record -for this host, port and database name. -
\n]; + There is already + a record + for this protocol, host, port and database name. + \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[(New ID specified.)
\n]; + $id = undef; + } } my $xc = irspy_xpath_context($rec); @@ -81,7 +111,7 @@ my @fields = 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" ], @@ -310,7 +340,7 @@ my %fieldsByKey = map { ( $_->[0], $_) } @fields; 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) { @@ -320,7 +350,8 @@ 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> @@ -332,7 +363,14 @@ if ($update && @changedFields) { Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>: <% join(", ", map { xml_encode($_->[2]) } @changedFields) %>. +% return if $op eq "new"; % } ++ Although anyone is allowed to add a new target, please note that + you will not be able to edit the newly added target unless you + have administrator privileges. So please be sure that the + details are correct before submitting them. +