From: Mike Taylor Date: Thu, 16 Nov 2006 11:53:33 +0000 (+0000) Subject: Refactor to include form.mc inline. X-Git-Tag: CPAN-v1.02~787 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=ffff14134a767a31948cb44d8c7695ab8e947aad;p=irspy-moved-to-github.git Refactor to include form.mc inline. (So form.mc is now redundant) This clarifies the flow of logic. --- diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc index e66684d..96a2948 100644 --- a/web/htdocs/details/edit.mc +++ b/web/htdocs/details/edit.mc @@ -1,4 +1,4 @@ -%# $Id: edit.mc,v 1.12 2006-11-16 11:50:03 mike Exp $ +%# $Id: edit.mc,v 1.13 2006-11-16 11:53:33 mike Exp $ <%args> $id => undef @@ -19,5 +19,113 @@ if (defined $id && $id ne "") { $rec = $rs->record(0); } } + +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) ], + ); + +my $nchanges = 0; +my $update = $r->param("update"); +if (defined $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 + } + ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode()); +} + +

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

+% if ($nchanges) { +

+ The record has been <% $r->param("new") ? "created" : "updated" %>.
+ Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>. +

+% } +
+ +<%perl> +foreach my $ref (@fields) { + my($name, $nlines, $caption, $xpath, @addAfter) = @$ref; + + + + + +% } + + + +
<% $caption %> +% my $rawdata = $xc->findvalue($xpath); +% my $data = xml_encode($rawdata, ""); +% if (ref $nlines) { + +% } elsif ($nlines) { + +% } else { + +% } +
+ +% if (defined $id) { + +% } else { + +% } +
+
+<%perl> + if ($nchanges && 0) { + my $x = $xc->getContextNode()->toString(); + $x = xml_encode($x); + #$x =~ s/$//gm; + print "
$x
\n"; + } -<& /details/form.mc, id => $id, conn => $conn, rec => $rec &>