X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fchrome%2Flayout.mc;h=1ec34b32d535ebca42a0c5a2e0e2a5085c1d1cff;hb=f09d2992d3d1d1620eb66c640b63b4387e4050e4;hp=3a62bf12cbfeff8e3e16088438fa6e5f1e3e33ca;hpb=31fa9427775bb444d34a4f203e6eaa2b17018303;p=irspy-moved-to-github.git
diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index 3a62bf1..1ec34b3 100644
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -1,15 +1,17 @@
-%# $Id: layout.mc,v 1.23 2007-02-20 19:20:23 mike Exp $
+%# $Id: layout.mc,v 1.30 2007-04-27 14:04:40 mike Exp $
<%args>
$debug => undef
$title
$component
%args>
<%once>
-use URI::Escape;
+use URI::Escape qw(uri_escape uri_escape_utf8);
use ZOOM;
use ZOOM::IRSpy::Web;
-use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_quote cql_target
- irspy_xpath_context modify_xml_document
+use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_target cql_quote
+ irspy_xpath_context irspy_make_identifier
+ irspy_record2identifier
+ irspy_identifier2target modify_xml_document
bib1_access_point);
%once>
% $r->content_type("text/html; charset=utf-8");
@@ -25,6 +27,9 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_quote cql_target
+
+
+
@@ -33,6 +38,9 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_quote cql_target
<% xml_encode($title) %>
|
+
+ |
+
@@ -66,23 +74,22 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_quote cql_target
% foreach my $i ('a' .. 'z') {
<% uc($i) %>
% }
+ [Others]
<%perl>
my $id = $r->param("id");
{
- # Make up ID for newly created records. It would be more
- # rigorously correct, but insanely inefficient, to submit the
- # record to Zebra and then search for it; but since we know the
- # formula for IDs anyway, we just build one by hand.
- my $id = $r->param("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");
- #warn "id='$id', host='$host', port='$port', dbname='$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 $host && defined $port && defined $dbname) {
- $id = "$host:$port/$dbname";
+ defined $protocol && defined $host &&
+ defined $port && defined $dbname) {
+ $id = irspy_make_identifier($protocol, $host, $port, $dbname);
#warn "id set to '$id'";
}
}