projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sleep 5 when given an invalid host or port, to slow down spammers.
[irspy-moved-to-github.git]
/
web
/
htdocs
/
details
/
full.mc
diff --git
a/web/htdocs/details/full.mc
b/web/htdocs/details/full.mc
index
d5b1799
..
abf5c01
100644
(file)
--- a/
web/htdocs/details/full.mc
+++ b/
web/htdocs/details/full.mc
@@
-1,4
+1,4
@@
-%# $Id: full.mc,v 1.28 2007-05-11 13:32:57 mike Exp $
+%# $Id: full.mc,v 1.30 2007-07-03 13:10:50 mike Exp $
<%args>
$id
</%args>
<%args>
$id
</%args>
@@
-57,39
+57,46
@@
if ($n == 0) {
<%perl>
foreach my $ref (@fields) {
my($caption, $xpath, @args) = @$ref;
<%perl>
foreach my $ref (@fields) {
my($caption, $xpath, @args) = @$ref;
- my $data;
+ my($data, $linkURL);
if (ref $xpath && ref($xpath) eq "CODE") {
if (ref $xpath && ref($xpath) eq "CODE") {
- $data = &$xpath(@args);
+ ($data, $linkURL) = &$xpath($id, @args);
} else {
$data = $xc->find($xpath);
}
if ($data) {
} else {
$data = $xc->find($xpath);
}
if ($data) {
+ print " <tr>\n";
+ $caption =~ s/\/(.*)//;
+ my $help = $1;
+ my($linkstart, $linkend) = ("", "");
+ if (defined $linkURL) {
+ $linkstart = '<a href="' . xml_encode($linkURL) . '">';
+ $linkend = "</a>";
+ }
</%perl>
</%perl>
- <tr>
-% $caption =~ s/\/(.*)//;
-% my $help = $1;
<th><% xml_encode($caption) %><%
!defined $help ? "" : $m->comp("/help/link.mc", help =>"info/$help")
%></th>
<th><% xml_encode($caption) %><%
!defined $help ? "" : $m->comp("/help/link.mc", help =>"info/$help")
%></th>
- <td><% xml_encode($data) %></td>
+ <td><% $linkstart . xml_encode($data) . $linkend %></td>
</tr>
% }
% }
</table>
<p>
</tr>
% }
% }
</table>
<p>
+% my $target = irspy_identifier2target($id);
+% $target =~ s/^tcp://; # Apparently ZAP can't handle the leading "tcp:"
<a href="<% xml_encode("http://targettest.indexdata.com/targettest/search/index.zap?" .
join("&",
<a href="<% xml_encode("http://targettest.indexdata.com/targettest/search/index.zap?" .
join("&",
- "target=" . uri_escape_utf8(irspy_identifier2target($id)),
+ "target=" . uri_escape_utf8($target),
"name=" . uri_escape_utf8($title),
"name=" . uri_escape_utf8($title),
- "attr=" . join(" ", list_ap($xc, "bib-1")),
- "formats=" . calc_recsyn($xc, " ")))
+ "attr=" . join(" ", _list_ap($xc, "bib-1")),
+ "formats=" . calc_recsyn($id, $xc, " ")))
%>">Search this target.</a>
</p>
% }
<%perl>
sub calc_reliability {
%>">Search this target.</a>
</p>
% }
<%perl>
sub calc_reliability {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @allpings = $xc->findnodes("i:status/i:probe");
my $nall = @allpings;
my @allpings = $xc->findnodes("i:status/i:probe");
my $nall = @allpings;
@@
-100,7
+107,7
@@
sub calc_reliability {
}
sub calc_init_options {
}
sub calc_init_options {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @ops;
my @nodes = $xc->findnodes('e:configInfo/e:supports/@type');
my @ops;
my @nodes = $xc->findnodes('e:configInfo/e:supports/@type');
@@
-115,9
+122,9
@@
sub calc_init_options {
}
sub calc_ap {
}
sub calc_ap {
- my($xc, $set) = @_;
+ my($id, $xc, $set) = @_;
- my @aps = list_ap($xc, $set);
+ my @aps = _list_ap($xc, $set);
my $n = @aps;
return "[none]" if $n == 0;
my $n = @aps;
return "[none]" if $n == 0;
@@
-144,10
+151,11
@@
sub calc_ap {
$res .= "-$last" if $last > $first;
}
$res .= "-$last" if $last > $first;
}
- return "$n access points: $res";
+ return ("$n access points: $res",
+ "/ap.html?id=$id&set=$set");
}
}
-sub list_ap {
+sub _list_ap {
my($xc, $set) = @_;
my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
my($xc, $set) = @_;
my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
@@
-157,7
+165,7
@@
sub list_ap {
}
sub calc_boolean {
}
sub calc_boolean {
- my($xc) = @_;
+ my($id, $xc) = @_;
### Note that we are currently interrogating an IRSpy extension.
# The standard ZeeRex record should be extended with a
### Note that we are currently interrogating an IRSpy extension.
# The standard ZeeRex record should be extended with a
@@
-169,14
+177,14
@@
sub calc_boolean {
}
sub calc_nrs {
}
sub calc_nrs {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
return @nodes ? "Yes" : "No";
}
sub calc_recsyn {
my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
return @nodes ? "Yes" : "No";
}
sub calc_recsyn {
- my($xc, $sep) = @_;
+ my($id, $xc, $sep) = @_;
$sep = ", " if !defined $sep;
my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
$sep = ", " if !defined $sep;
my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
@@
-186,7
+194,7
@@
sub calc_recsyn {
}
sub calc_explain {
}
sub calc_explain {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @nodes = $xc->findnodes('i:status/i:explain[@ok = "1"]');
my $res = join(", ", map { $_->findvalue('@category') } @nodes);
my @nodes = $xc->findnodes('i:status/i:explain[@ok = "1"]');
my $res = join(", ", map { $_->findvalue('@category') } @nodes);