X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=e813ae0aae87a7b320dd77a24cc090b230337d1e;hb=cf2404764bbafd54710bf999de68ec0963c44bce;hp=4b0b540e6a8f0be9bc8f85bbb0c7fc14cfa35407;hpb=7e30dd5f86e43b3e2f19b33d713d413168c7fd6b;p=irspy-moved-to-github.git
diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index 4b0b540..e813ae0 100644
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,7 +1,7 @@
-%# $Id: edit.mc,v 1.30 2007-04-27 14:04:40 mike Exp $
+%# $Id: edit.mc,v 1.34 2007-05-03 12:54:18 mike Exp $
<%args>
$op
-$id => undef
+$id => undef ### should be extracted using utf8param()
$update => undef
%args>
<%doc>
@@ -35,48 +35,56 @@ 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");
+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 $protocol = $r->param("protocol"); - my $host = $r->param("host"); - my $port = $r->param("port"); - my $dbname = $r->param("dbname"); - if (!defined $protocol || $protocol eq "" || - !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 protocol, host, port and database name.
\n] if $update; + Please specify protocol, host, port and database name.\n]; undef $update; } else { - ### Should use a utility function for this - my $query = cql_target($protocol, $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(irspy_make_identifier($protocol, $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); @@ -86,7 +94,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" ], @@ -315,7 +323,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) { @@ -325,7 +333,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> @@ -371,7 +380,9 @@ foreach my $ref (@fields) {