X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=1d789f0655d32243c2513428d59e5a9c50a1c287;hb=8625486cd778ef83c03fb5d5541b1485dfc02de7;hp=96a2948ff80f149d89d0a9a5e7decd7d3390f471;hpb=72e3db14db715aff6dc006c5d986e16d68037297;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index 96a2948..1d789f0 100644
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,22 +1,63 @@
-%# $Id: edit.mc,v 1.13 2006-11-16 11:53:33 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>
 my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
-				user => "admin", password => "fruitbat");
+				user => "admin", password => "fruitbat",
+				elementSetName => "zeerex");
 my $rec = '<explain xmlns="http://explain.z3950.org/dtd/2.0/"/>';
 if (defined $id && $id ne "") {
-    $conn->option(elementSetName => "zeerex");
-    my $qid = $id;
-    $qid =~ s/"/\\"/g;
-    my $query = qq[rec.id="$qid"];
+    # Existing record
+    my $query = 'rec.id="' . cql_quote($id) . '"';
     my $rs = $conn->search(new ZOOM::Query::CQL($query));
-    my $n = $rs->size();
-    if ($n == 0) {
+    if ($rs->size() > 0) {
+	$rec = $rs->record(0);
+    } else {
 	$id = undef;
+    }
+
+} else {
+    # New record
+    my $host = $r->param("host");
+    my $port = $r->param("port");
+    my $dbname = $r->param("dbname");
+    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];
+	$r->param(update => 0);
     } else {
-	$rec = $rs->record(0);
+	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];
+	}
     }
 }
 
@@ -59,7 +100,7 @@ my @fields =
 
 my $nchanges = 0;
 my $update = $r->param("update");
-if (defined $update) {
+
     # Update record with submitted data
     my %fieldsByKey = map { ( $_->[0], $_) } @fields;
     my %data;
@@ -67,8 +108,10 @@ if (defined $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
     }
@@ -78,7 +121,7 @@ if (defined $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>
 % }
@@ -102,9 +145,9 @@ foreach my $ref (@fields) {
 %     }
      </select>
 % } elsif ($nlines) {
-     <textarea name="<% $name %>" rows="<% $nlines %>" cols="55"><% $data %></textarea>
+     <textarea name="<% $name %>" rows="<% $nlines %>" cols="51"><% $data %></textarea>
 % } else {
-     <input name="<% $name %>" type="text" size="60" value="<% $data %>">
+     <input name="<% $name %>" type="text" size="60" value="<% $data %>"/>
 % }
     </td>
    </tr>
@@ -117,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>