-%# $Id: layout.mc,v 1.30 2007-04-27 14:04:40 mike Exp $
+%# $Id: layout.mc,v 1.33 2007-05-03 14:13:44 mike Exp $
<%args>
$debug => undef
$title
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
<a href="/find.html?cql.allRecords=1+not+dc.title+=/regexp/firstInField+[a-z].*&_sort=dc.title&_count=9999&_search=Search">[Others]</a>
</p>
<%perl>
-my $id = $r->param("id");
+# 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 = utf8param($r, "id");
{
# Make up ID for newly created records.
- my $protocol = $r->param("protocol");
- my $host = $r->param("host");
- my $port = $r->param("port");
- my $dbname = $r->param("dbname");
+ my $protocol = utf8param($r, "protocol");
+ my $host = utf8param($r, "host");
+ my $port = utf8param($r, "port");
+ my $dbname = utf8param($r, "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/>