X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fchrome%2Flayout.mc;h=bff813d00b11dd4e2c7e8d6d145d37b260621056;hp=1ec34b32d535ebca42a0c5a2e0e2a5085c1d1cff;hb=38f36b73de2b5c36852c2693a7c6a1275d38c5d4;hpb=7e30dd5f86e43b3e2f19b33d713d413168c7fd6b

diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index 1ec34b3..bff813d 100644
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -1,4 +1,4 @@
-%# $Id: layout.mc,v 1.30 2007-04-27 14:04:40 mike Exp $
+%# $Id: layout.mc,v 1.32 2007-05-03 12:42:32 mike Exp $
 <%args>
 $debug => undef
 $title
@@ -8,7 +8,7 @@ $component
 use URI::Escape qw(uri_escape uri_escape_utf8);
 use ZOOM;
 use ZOOM::IRSpy::Web;
-use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_target cql_quote
+use ZOOM::IRSpy::Utils qw(utf8param isodate xml_encode cql_target cql_quote
                           irspy_xpath_context irspy_make_identifier
 			  irspy_record2identifier
 			  irspy_identifier2target modify_xml_document
@@ -77,6 +77,10 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_target cql_quote
       <a href="/find.html?cql.allRecords=1+not+dc.title+=/regexp/firstInField+[a-z].*&amp;_sort=dc.title&amp;_count=9999&amp;_search=Search">[Others]</a>
      </p>
 <%perl>
+# Find the identifier to use in the record-specific menu, if any.  If
+# the identifier components are all present (e.g. because a record has
+# just been edited or copied) we make an ID from those; otherwise we
+# use the "id" parameter, if specified.
 my $id = $r->param("id");
 {
     # Make up ID for newly created records.
@@ -86,15 +90,14 @@ my $id = $r->param("id");
     my $dbname = $r->param("dbname");
     #warn "id='$id', protocol='$protocol' host='$host', port='$port', dbname='$dbname'";
     #warn "%ARGS = {\n" . join("", map { "\t'$_' => '" . $ARGS{$_} . ",'\n" } sort keys %ARGS) . "}\n";
-    if ((!defined $id || $id eq "") &&
-	defined $protocol && defined $host &&
+    if (defined $protocol && defined $host &&
 	defined $port && defined $dbname) {
 	$id = irspy_make_identifier($protocol, $host, $port, $dbname);
 	#warn "id set to '$id'";
     }
 }
 </%perl>
-% if (defined $id && $r->param("op") ne "copy") {
+% if (defined $id) {
      <div class="panel2">
       <b>This Target</b>
       <br/>