X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=a22e81154c40447c5ac7ffa9f124c5e866325944;hb=7e3daef919cb17cc5090773fc09b1c55d596eb91;hp=92b5fa2c607b02d7879e65c4504771f51890cf70;hpb=f710bbf2da2d0478be71ca49425aa70be89c26d2;p=irspy-moved-to-github.git diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc index 92b5fa2..a22e811 100644 --- a/web/htdocs/details/edit.mc +++ b/web/htdocs/details/edit.mc @@ -1,24 +1,55 @@ -%# $Id: edit.mc,v 1.19 2006-11-16 17:52:06 mike Exp $ +%# $Id: edit.mc,v 1.23 2006-12-05 17:37:18 mike Exp $ <%args> +$op $id => undef +$update => undef +<%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. + <%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 = ''; -if (defined $id && $id ne "") { +if (defined $id && ($op ne "copy" || !$update)) { # Existing record my $query = 'rec.id="' . cql_quote($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; } } 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"); @@ -26,8 +57,8 @@ if (defined $id && $id ne "") { !defined $port || $port eq "" || !defined $dbname || $dbname eq "") { print qq[

-You must specify host, port and database name.

\n]; - $r->param(update => 0); +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)); @@ -35,9 +66,10 @@ You must specify host, port and database name.

\n]; my $fakeid = xml_encode(uri_escape("$host:$port/$dbname")); print qq[

There is already -a record +a record for this host, port and database name.

\n]; + undef $update; } } } @@ -45,21 +77,21 @@ for this host, port and database name. my $xc = irspy_xpath_context($rec); my @fields = ( + [ title => 0, "Name", "e:databaseInfo/e:title", + qw() ], + [ country => 0, "Country", "i:status/i:country" ], [ protocol => [ qw(Z39.50 SRW SRU SRW/U) ], "Protocol", "e:serverInfo/\@protocol" ], [ host => 0, "Host", "e:serverInfo/e:host" ], [ port => 0, "Port", "e:serverInfo/e:port" ], [ dbname => 0, "Database Name", "e:serverInfo/e:database", qw(e:host e:port) ], - [ type => [ qw(Academic Public Corporate Special National Education Other) ], + [ type => [ "", qw(Academic Public Corporate Special National Education Other) ], "Type of Library", "i:status/i:libraryType" ], - [ country => 0, "Country", "i:status/i:country" ], [ 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) ], - [ title => 0, "Title", "e:databaseInfo/e:title", - qw() ], [ description => 5, "Description", "e:databaseInfo/e:description", qw(e:title) ], [ author => 0, "Author", "e:databaseInfo/e:author", @@ -79,31 +111,32 @@ my @fields = qw(e:title e:description) ], ); -my $nchanges = 0; -my $update = $r->param("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); - } - my $mynchanges = modify_xml_document($xc, \%fieldsByKey, \%data); - -if ($update) { - $nchanges = $mynchanges; - 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()); } +

<% xml_encode($xc->find("e:databaseInfo/e:title"), "[Untitled]") %>

-% if ($nchanges) { +% if ($update && @changedFields) { +% my $nchanges = @changedFields;

- 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) %>.

% }
@@ -115,38 +148,40 @@ foreach my $ref (@fields) { <% $caption %> -% my $rawdata = $xc->findvalue($xpath); -% my $data = xml_encode($rawdata, ""); +% my $rawval = $xc->findvalue($xpath); +% my $val = xml_encode($rawval, ""); % if (ref $nlines) { % } elsif ($nlines) { - + % } else { - + % } + + <& /help/link.mc, help => "edit/$name" &> + % } + % if (defined $id) { -% } else { - % }
<%perl> - if ($nchanges && 0) { + if (@changedFields && 0) { my $x = $xc->getContextNode()->toString(); $x = xml_encode($x); #$x =~ s/$//gm;