X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=1d789f0655d32243c2513428d59e5a9c50a1c287;hb=7e98567d1db6ab1686ed84b8f869bccaf5b3fa79;hp=c1c1abb129bae388580fba3e00bcfdf1c5f474cd;hpb=33823329823c1a76cca6af206ba35f0978c75afa;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index c1c1abb..1d789f0 100644
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,5 +1,24 @@
-%# $Id: edit.mc,v 1.18 2006-11-16 17:30:25 mike Exp $
+%# $Id: edit.mc,v 1.20 2006-11-17 22:39:17 mike Exp $
+<%doc>
+Since this form is used in many different situations, some care is
+merited in considering the possibilities:
+
+New?	Copy	ID?	Situation
+--------------------------------------------------------------------------
+Y			Blank form for adding a new target.
+Y			New target submitted successfully.
+Y			Partial new target submitted, requiring more
+
+		Y	Existing target to be edited.
+		Y	Existing target has been updated.
+
+	Y	Y	Existing target to be copied.
+	Y		New or copied target rejected due to duplicate ID.
+--------------------------------------------------------------------------
+</%doc>
 <%args>
+$new => undef
+$copy => undef
 $id => undef
 </%args>
 <%perl>
@@ -25,11 +44,21 @@ if (defined $id && $id ne "") {
     if (!defined $host || $host eq "" ||
 	!defined $port || $port eq "" ||
 	!defined $dbname || $dbname eq "") {
-	print qq[<p class="error">You must specify host, port and database name.</p>\n];
+	print qq[<p class="error">
+You must specify host, port and database name.</p>\n];
 	$r->param(update => 0);
+    } 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[<p class="error">
+There is already
+<a href='?id=$fakeid'>a record</a>
+for this host, port and database name.
+</p>\n];
+	}
     }
-
-    my $query = cql_target($host, $port, $dbname);
 }
 
 my $xc = irspy_xpath_context($rec);
@@ -71,7 +100,7 @@ my @fields =
 
 my $nchanges = 0;
 my $update = $r->param("update");
-if ($update) {
+
     # Update record with submitted data
     my %fieldsByKey = map { ( $_->[0], $_) } @fields;
     my %data;
@@ -79,8 +108,10 @@ if ($update) {
 	next if grep { $key eq $_ } qw(id update new copy);
 	$data{$key} = $r->param($key);
     }
+    my $mynchanges = modify_xml_document($xc, \%fieldsByKey, \%data);
 
-    $nchanges = modify_xml_document($xc, \%fieldsByKey, \%data);
+if ($update) {
+    $nchanges = $mynchanges;
     if ($nchanges) {
 	### Set e:metaInfo/e:dateModified
     }
@@ -90,7 +121,7 @@ if ($update) {
  <h2><% xml_encode($xc->find("e:databaseInfo/e:title"), "[Untitled]") %></h2>
 % if ($nchanges) {
  <p style="font-weight: bold">
-  The record has been <% $r->param("new") ? "created" : "updated" %>.<br/>
+  The record has been <% $new ? "created" : "updated" %>.<br/>
   Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>.
  </p>
 % }
@@ -129,6 +160,9 @@ foreach my $ref (@fields) {
 % } else {
      <input type="hidden" name="new" value="1"/>
 % }
+% if (defined $copy) {
+     <input type="hidden" name="copy" value="<% xml_encode($copy) %>"/>
+% }
     </td>
    </tr>
   </table>