X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=7b3e6d7846fd737e3612b6cec2a5b657781eb380;hb=9a70299cad3594ec4a38d9b4139705b6e49accdc;hp=c1c1abb129bae388580fba3e00bcfdf1c5f474cd;hpb=33823329823c1a76cca6af206ba35f0978c75afa;p=irspy-moved-to-github.git
diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index c1c1abb..7b3e6d7 100644
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,35 +1,77 @@
-%# $Id: edit.mc,v 1.18 2006-11-16 17:30:25 mike Exp $
+%# $Id: edit.mc,v 1.21 2006-11-29 18:22:08 mike Exp $
<%args>
+$op
$id => undef
+$update => undef
%args>
+<%doc>
+Since this form is used in many different situations, some care is
+merited in considering the possibilities:
+
+Situation Op ID Update
+----------------------------------------------------------------------
+Blank form for adding a new target new
+New target rejected, changes required new X
+New target accepted and added new X
+---------------------------------------------------------------------
+Existing target to be edited edit X
+Edit rejected, changes required edit X X
+Target successfully updated edit X X
+----------------------------------------------------------------------
+Existing target to be copied copy X
+New target rejected, changes required copy X X
+New target accepted and added copy X X
+----------------------------------------------------------------------
+
+Submissions, whether of new targets, edits or copies, may be rejected
+due either to missing mandatory fields or host/name/port that form a
+duplicate ID.
+%doc>
<%perl>
+# Sanity checking
+die "op = new but id defined" if $op eq "new" && defined $id;
+die "op != new but id undefined" if $op ne "new" && !defined $id;
+
my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
user => "admin", password => "fruitbat",
elementSetName => "zeerex");
my $rec = '
(New ID specified.)
\n]; $id = undef; } } else { - # New record + # 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 "") { - print qq[You must specify host, port and database name.
\n]; - $r->param(update => 0); + print qq[+You must specify host, port and database name.
\n] if $update; + undef $update; + } else { + my $query = cql_target($host, $port, $dbname); + my $rs = $conn->search(new ZOOM::Query::CQL($query)); + if ($rs->size() > 0) { + my $fakeid = xml_encode(uri_escape("$host:$port/$dbname")); + print qq[+There is already +a record +for this host, port and database name. +
\n]; + undef $update; + } } - - my $query = cql_target($host, $port, $dbname); } my $xc = irspy_xpath_context($rec); @@ -69,29 +111,32 @@ my @fields = qw(e:title e:description) ], ); -my $nchanges = 0; -my $update = $r->param("update"); -if ($update) { - # Update record with submitted data - my %fieldsByKey = map { ( $_->[0], $_) } @fields; - my %data; - foreach my $key ($r->param()) { - next if grep { $key eq $_ } qw(id update new copy); - $data{$key} = $r->param($key); - } - - $nchanges = modify_xml_document($xc, \%fieldsByKey, \%data); - if ($nchanges) { - ### Set e:metaInfo/e:dateModified - } +# Update record with submitted data +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); +} +my @changedFields = modify_xml_document($xc, \%fieldsByKey, \%data); +if ($update && @changedFields) { + my @x = modify_xml_document($xc, { dateModified => + [ dateModified => 0, + "Data/time modified", + "e:metaInfo/e:dateModified" ] }, + { dateModified => isodate(time()) }); + die "Didn't set dateModified!" if !@x; ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode()); } + %perl>
- The record has been <% $r->param("new") ? "created" : "updated" %>.
- Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>.
+ The record has been <% $op ne "edit" ? "created" : "updated" %>.
+ Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>:
+ <% join(", ", map { xml_encode($_->[2]) } @changedFields) %>.