X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fchrome%2Flayout.mc;h=4d984634219774e98432e59f171a4eafec150d1e;hp=beef6ace34c7284627a3912d5cd089f2580e0cc7;hb=eaf6ff0997e5623feb58b621bafb38eca58b5160;hpb=4d14fca3f22392e92e9abc3b2b0d0a112752935e diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc index beef6ac..4d98463 100644 --- a/web/htdocs/chrome/layout.mc +++ b/web/htdocs/chrome/layout.mc @@ -1,4 +1,3 @@ -%# $Id: layout.mc,v 1.29 2007-04-26 14:38:37 mike Exp $ <%args> $debug => undef $title @@ -8,11 +7,14 @@ $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 - irspy_xpath_context modify_xml_document - bib1_access_point); +use ZOOM::IRSpy::Utils qw(utf8param trimField isodate xml_encode cql_target cql_quote + irspy_xpath_context irspy_make_identifier + irspy_record2identifier + irspy_identifier2target modify_xml_document + bib1_access_point calc_reliability_string); % $r->content_type("text/html; charset=utf-8"); +% my $text = $m->scomp($component, %ARGS); - - -
-
-

- 		-
-

<% xml_encode($title) %>

-
- + +
+

+ + +
+

<% xml_encode($title) %>

+ + + @@ -63,7 +65,8 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_target cql_quote Home
Test all targets
Find a target
- Add a target
+ Add a target
+ Upload a target
Statistics

@@ -72,46 +75,47 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_target cql_quote % foreach my $i ('a' .. 'z') { <% uc($i) %> % } - [Others] + [Others]

<%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. 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"); - my $host = $r->param("host"); - my $port = $r->param("port"); - my $dbname = $r->param("dbname"); - #warn "id='$id', host='$host', port='$port', dbname='$dbname'"; + # Make up ID for newly created records. + 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 $host && defined $port && defined $dbname) { - $id = "$host:$port/$dbname"; + if (defined $protocol && defined $host && + defined $port && defined $dbname) { + $id = irspy_make_identifier($protocol, $host, $port, $dbname); #warn "id set to '$id'"; } } -% if (defined $id && $r->param("op") ne "copy") { +% if (defined $id) {
This Target
- Show details + Show details
- ">Edit details + ">Edit details
- ">Copy target + ">Copy target
- Delete target + Delete target

- ">Quick Test + ">Quick Test
- ">Full Test + ">Full Test

- XML + XML

<%doc>
@@ -140,7 +144,7 @@ my $id = $r->param("id");   -<& $component, %ARGS &> +% print $text; @@ -150,7 +154,11 @@ my $id = $r->param("id"); Powered by Index Data + >Index Data. +
+ Report errors and omissions to irspy@indexdata.com