X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=2fa9a0addb781042ea28e2438177f79db78f3ee3;hp=c3ed2245e04a01a7ee6afd9aae8e55e9f68881fb;hb=dcaee79b19b1d82da48b7f26c8f9ba0339a56dac;hpb=ae0b54d2d61c60d5a397c58e067e5177ee04f65a

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index c3ed224..2fa9a0a 100644
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,4 +1,4 @@
-%# $Id: edit.mc,v 1.4 2006-10-27 17:16:20 mike Exp $
+%# $Id: edit.mc,v 1.8 2006-11-08 17:42:11 mike Exp $
 <%args>
 $id
 </%args>
@@ -25,60 +25,62 @@ if ($n == 0) {
 	 [ 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" ],
-	 [ username     => 0, "Username (if needed)", "e:serverInfo/e:authentication/e:user" ],
-	 [ password     => 0, "Password (if needed)", "e:serverInfo/e:authentication/e:password" ],
-	 [ title        => 0, "title", "e:databaseInfo/e:title", lang => "en", primary => "true" ],
-	 [ description  => 5, "Description", "e:databaseInfo/e:description", lang => "en", primary => "true" ],
-	 [ author       => 0, "Author", "e:databaseInfo/e:author" ],
-	 [ contact      => 0, "Contact", "e:databaseInfo/e:contact" ],
-	 [ extent       => 3, "Extent", "e:databaseInfo/e:extent" ],
-	 [ history      => 5, "History", "e:databaseInfo/e:history" ],
-	 [ language     => 0, "Language of Records", "e:databaseInfo/e:langUsage" ],
-	 [ restrictions => 2, "Restrictions", "e:databaseInfo/e:restrictions" ],
-	 [ subjects     => 2, "Subjects", "e:databaseInfo/e:subjects" ],
-	 ### Remember to set e:metaInfo/e:dateModified
+	 [ 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) ],
 	 );
-    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, %attrs) = @$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)<br/>\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)<br/>\n";
-		} else {
-		    warn "unexpected node type $node";
-		}
-	    } else {
-		print "$key='$value' ($xpath) no nodes<br/>\n";
-		### Make new node ... heaven knows how ...
-	    }
+	    $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());
     }
 </%perl>
-     <h2><% xml_encode($id) %></h2>
-% print "     <p><b>The record has been updated.</b></p>\n" if defined $update;
+     <h2><% xml_encode($xc->find("e:databaseInfo/e:title")) %></h2>
+% if ($nchanges) {
+     <p style="font-weight: bold">
+      The record has been updated.<br/>
+      Changed <% $nchanges %> element<% $nchanges == 1 ? "" : "s" %>.
+     </p>
+% }
      <form method="get" action="">
       <table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
 <%perl>
     foreach my $ref (@fields) {
-	my($name, $nlines, $caption, $xpath, %attrs) = @$ref;
+	my($name, $nlines, $caption, $xpath, @addAfter) = @$ref;
 </%perl>
        <tr>
 	<th><% $caption %></th>
@@ -100,4 +102,12 @@ if ($n == 0) {
        </tr>
       </table>
      </form>
+<%perl>
+	if ($nchanges) {
+	    my $x = $xc->getContextNode()->toString();
+	    $x = xml_encode($x);
+	    #$x =~ s/$/<br\/>/gm;
+	    print "<pre>$x</pre>\n";
+	}
+</%perl>
 % }