X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=7b3e6d7846fd737e3612b6cec2a5b657781eb380;hb=9a70299cad3594ec4a38d9b4139705b6e49accdc;hp=9e234e9abca67d5ece338b03b517e9eaa167c6dd;hpb=9ec36a8eb17452c8ee980db1aeee81daf6185eaf;p=irspy-moved-to-github.git
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
%args>
-<%once>
-use ZOOM;
-%once>
+<%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");
-$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 = '
(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)+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()); +} + %perl> -The record has been updated.
\n" if defined $update; - +<%perl> + if (@changedFields && 0) { + my $x = $xc->getContextNode()->toString(); + $x = xml_encode($x); + #$x =~ s/$/$x\n"; + } +%perl>