From 64ba9e0d62000116f10a279ee1c082defd8d8ec2 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 1 Nov 2006 10:00:21 +0000 Subject: [PATCH] Use new modify_xml_document() utility function. Indicate number of changes. --- web/htdocs/details/edit.mc | 45 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc index 9e234e9..3118a34 100644 --- a/web/htdocs/details/edit.mc +++ b/web/htdocs/details/edit.mc @@ -1,4 +1,4 @@ -%# $Id: edit.mc,v 1.5 2006-10-31 09:26:59 mike Exp $ +%# $Id: edit.mc,v 1.6 2006-11-01 10:00:21 mike Exp $ <%args> $id @@ -49,44 +49,33 @@ if ($n == 0) { 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 $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); - 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); - } + $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($id) %>

-% print "

The record has been updated.

\n" if defined $update; +% if (defined $update) { +

The record has been updated (nchanges=<% $nchanges %>).

+% } +% if ($nchanges) { +

Changed <% $nchanges %> element<% $nchanges == 1 ? "" : "s" %>.

+% }
<%perl> -- 1.7.10.4