From 80a67d04a0d55b694c40cab759c1e49a1ea3e535 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 16 Apr 2007 10:37:05 +0000 Subject: [PATCH] Include outbound link to ZAP. --- web/htdocs/details/full.mc | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc index dd48c28..7f74932 100644 --- a/web/htdocs/details/full.mc +++ b/web/htdocs/details/full.mc @@ -1,4 +1,4 @@ -%# $Id: full.mc,v 1.22 2007-02-02 11:31:30 mike Exp $ +%# $Id: full.mc,v 1.23 2007-04-16 10:37:05 mike Exp $ <%args> $id @@ -54,8 +54,9 @@ if ($n == 0) { [ "Record syntaxes" => \&calc_recsyn, $xc ], [ "Explain" => \&calc_explain, $xc ], ); + my $title = $xc->find("e:databaseInfo/e:title"); -

<% xml_encode($xc->find("e:databaseInfo/e:title"), "") %>

+

<% xml_encode($title, "") %>

<%perl> foreach my $ref (@fields) { @@ -75,6 +76,15 @@ if ($n == 0) { % } % }
+

+ ">Search this target. +

% } <%perl> @@ -107,17 +117,13 @@ sub calc_init_options { sub calc_ap { my($xc, $set) = @_; - my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[ - @set = "'.$set.'" and @type = "1"]'; - my @nodes = $xc->findnodes($expr); - my $n = @nodes; + my @aps = list_ap($xc, $set); + my $n = @aps; return "[none]" if $n == 0; my $res = ""; my($first, $last); - @nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @nodes; - foreach my $node (@nodes) { - my $ap .= $node->findvalue("."); + foreach my $ap (@aps) { if (!defined $first) { $first = $last = $ap; } elsif ($ap == $last+1) { @@ -141,6 +147,15 @@ sub calc_ap { return "$n access points: $res"; } +sub list_ap { + my($xc, $set) = @_; + + my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[ + @set = "'.$set.'" and @type = "1"]'; + my @nodes = $xc->findnodes($expr); + return sort { $a <=> $b } map { $_->findvalue(".") } @nodes; +} + sub calc_boolean { my($xc) = @_; @@ -161,10 +176,11 @@ sub calc_nrs { } sub calc_recsyn { - my($xc) = @_; + my($xc, $sep) = @_; + $sep = ", " if !defined $sep; my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax'); - my $res = join(", ", map { $_->findvalue('@name') } @nodes); + my $res = join($sep, map { $_->findvalue('@name') } @nodes); $res = "[none]" if $res eq ""; return $res; } @@ -177,5 +193,4 @@ sub calc_explain { $res = "[none]" if $res eq ""; return $res; } - -- 1.7.10.4