X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=7b3e6d7846fd737e3612b6cec2a5b657781eb380;hp=9e234e9abca67d5ece338b03b517e9eaa167c6dd;hb=162505433aee51cfb32bd8305d0942a434ba4e00;hpb=9ec36a8eb17452c8ee980db1aeee81daf6185eaf diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc index 9e234e9..7b3e6d7 100644 --- a/web/htdocs/details/edit.mc +++ b/web/htdocs/details/edit.mc @@ -1,116 +1,187 @@ -%# $Id: edit.mc,v 1.5 2006-10-31 09:26:59 mike Exp $ +%# $Id: edit.mc,v 1.21 2006-11-29 18:22:08 mike Exp $ <%args> -$id +$op +$id => undef +$update => undef -<%once> -use ZOOM; - +<%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"); -$conn->option(elementSetName => "zeerex"); -my $qid = $id; -$qid =~ s/"/\\"/g; -my $query = qq[rec.id="$qid"]; -my $rs = $conn->search(new ZOOM::Query::CQL($query)); -my $n = $rs->size(); -if ($n == 0) { - $m->comp("/details/error.mc", - title => "Error", message => "No such ID '$id'"); + user => "admin", password => "fruitbat", + elementSetName => "zeerex"); +my $rec = ''; +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 { - my $rec = $rs->record(0); - my $xc = irspy_xpath_context($rec); - my @fields = - ( - [ protocol => 0, "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) ], - [ 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", - qw(e:title e:description) ], - [ contact => 0, "Contact", "e:databaseInfo/e:contact", - qw(e:title e:description) ], - [ extent => 3, "Extent", "e:databaseInfo/e:extent", - qw(e:title e:description) ], - [ history => 5, "History", "e:databaseInfo/e:history", - qw(e:title e:description) ], - [ language => 0, "Language of Records", "e:databaseInfo/e:langUsage", - qw(e:title e:description) ], - [ restrictions => 2, "Restrictions", "e:databaseInfo/e:restrictions", - qw(e:title e:description) ], - [ subjects => 2, "Subjects", "e:databaseInfo/e:subjects", - qw(e:title e:description) ], - ### Remember to set e:metaInfo/e:dateModified - ); - my %fieldsByKey = map { ( $_->[0], $_) } @fields; - my $update = $r->param("update"); - if (defined $update) { - # Update record with submitted data - foreach my $key ($r->param()) { - next if grep { $key eq $_ } qw(id update); - my $value = $r->param($key); - my $ref = $fieldsByKey{$key} or die "no field '$key'"; - my($name, $nlines, $caption, $xpath, @addAfter) = @$ref; - my @nodes = $xc->findnodes($xpath); - if (@nodes) { - warn scalar(@nodes), " nodes match '$xpath'" if @nodes > 1; - my $node = $nodes[0]; - if ($node->isa("XML::LibXML::Attr")) { - $node->setValue($value); - #print "Attr $key <- '$value' ($xpath)
\n"; - } elsif ($node->isa("XML::LibXML::Element")) { - my $child = $node->firstChild(); - die "element child $child is not text" - if !ref $child || !$child->isa("XML::LibXML::Text"); - $child->setData($value); - #print "Elem $key <- '$value' ($xpath)
\n"; - } else { - warn "unexpected node type $node"; - } - } else { - next if !$value; - my($ppath, $element) = $xpath =~ /(.*)\/(.*)/; - dom_add_element($xc, $ppath, $element, $value, @addAfter); - } + # 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] 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; } - ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode()); } +} + +my $xc = irspy_xpath_context($rec); +my @fields = + ( + [ 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 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", + qw(e:title e:description) ], + [ hosturl => 0, "URL to Hosting Organisation", "i:status/i:hostURL" ], + [ contact => 0, "Contact", "e:databaseInfo/e:contact", + qw(e:title e:description) ], + [ extent => 3, "Extent", "e:databaseInfo/e:extent", + qw(e:title e:description) ], + [ history => 5, "History", "e:databaseInfo/e:history", + qw(e:title e:description) ], + [ language => 0, "Language of Records", "e:databaseInfo/e:langUsage", + qw(e:title e:description) ], + [ restrictions => 2, "Restrictions", "e:databaseInfo/e:restrictions", + qw(e:title e:description) ], + [ subjects => 2, "Subjects", "e:databaseInfo/e:subjects", + qw(e:title e:description) ], + ); + +# 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($id) %>

-% print "

The record has been updated.

\n" if defined $update; -
- +

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

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

+ The record has been <% $op ne "edit" ? "created" : "updated" %>.
+ Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>: + <% join(", ", map { xml_encode($_->[2]) } @changedFields) %>. +

+% } + +
<%perl> - foreach my $ref (@fields) { - my($name, $nlines, $caption, $xpath, @addAfter) = @$ref; +foreach my $ref (@fields) { + my($name, $nlines, $caption, $xpath, @addAfter) = @$ref; - - - + + - + + % } - - - -
<% $caption %> -% my $data = xml_encode($xc->find($xpath)); -% if ($nlines) { - +
<% $caption %> +% my $rawval = $xc->findvalue($xpath); +% my $val = xml_encode($rawval, ""); +% if (ref $nlines) { + +% } elsif ($nlines) { + % } else { - + % } -
- - -
-
+ + + + +% if (defined $id) { + % } + + + + +<%perl> + if (@changedFields && 0) { + my $x = $xc->getContextNode()->toString(); + $x = xml_encode($x); + #$x =~ s/$//gm; + print "
$x
\n"; + } +