From 312363781e0ab6ff0ef10b1784a8985fd07bf501 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Tue, 5 Dec 2006 17:18:30 +0000 Subject: [PATCH] Results summary shows reliability rather than author. --- web/htdocs/details/found.mc | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index 7c404f0..7e1eb0a 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,4 +1,4 @@ -%# $Id: found.mc,v 1.21 2006-11-29 18:21:15 mike Exp $ +%# $Id: found.mc,v 1.22 2006-12-05 17:18:30 mike Exp $ <%once> sub print_navlink { my($params, $cond, $caption, $skip) = @_; @@ -19,6 +19,21 @@ sub navlink { return $url; } +# Identical to the same-named function in full.mc +# So maybe this should go into IRSpy::Utils.pm? +# +sub calc_reliability { + my($xc) = @_; + + my @allpings = $xc->findnodes("i:status/i:probe"); + my $nall = @allpings; + return "[untested]" if $nall == 0; + my @okpings = $xc->findnodes('i:status/i:probe[@ok = "1"]'); + my $nok = @okpings; + return "$nok/$nall = " . int(100*$nok/$nall) . "%"; +} + + # Just make this once; forge the connection on first use our $conn = undef; @@ -100,7 +115,7 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count); # Title - Author + Reliability Host Port DB @@ -112,7 +127,7 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count); <%perl> my $xc = irspy_xpath_context($rs->record($i-1)); my $title = $xc->find("e:databaseInfo/e:title"); -my $author = $xc->find("e:databaseInfo/e:author"); +my $reliability = calc_reliability($xc); my $host = $xc->find("e:serverInfo/e:host"); my $port = $xc->find("e:serverInfo/e:port"); my $db = $xc->find("e:serverInfo/e:database"); @@ -125,7 +140,7 @@ push @ids, $id; <% $i %> <% xml_encode($title, "[untitled]") %> - <% xml_encode($author, "") %> + <% xml_encode($reliability, "", { nbsp => 1 }) %> <% xml_encode($host, "") %> <% xml_encode($port, "") %> <% xml_encode($db, "") %> -- 1.7.10.4