Nicer allRecords query.

[irspy-moved-to-github.git] / web / htdocs / details / found.mc

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index 20a91b9..a639991 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,4 +1,4 @@
-%# $Id: found.mc,v 1.16 2006-10-26 17:22:56 mike Exp $
+%# $Id: found.mc,v 1.23 2006-12-14 16:41:06 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;
 </%once>
@@ -37,7 +52,7 @@ if ($params{_query}) {
        $query .= "$key = ($val)";
     }
 }
-$query = 'cql.allRecords=x' if $query eq "";
+$query = 'cql.allRecords=1' if $query eq "";
 
 my $sort = $params{"_sort"};
 if ($sort) {
@@ -77,10 +92,10 @@ my $first = $skip+1;
 my $last = $first+$count-1;
 $last = $n if $last > $n;
 </%perl>
-     <form method="get" action="">
+     <form method="get" action=""><p>
       <input type="text" name="_query" size="60" value="<% xml_encode($query) %>"/>
       <input type="submit" name="_search" value="Search"/>
-     </form>
+     </p></form>
      <p>
 % if ($n == 0) {
       No matches
@@ -100,7 +115,7 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
       <tr class="thleft">
        <th>#</th>
        <th>Title</th>
-       <th>Author</th>
+       <th>Reliability</th>
        <th>Host</th>
        <th>Port</th>
        <th>DB</th>
@@ -110,10 +125,9 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
 % my @ids;
 % foreach my $i ($first .. $last) {
 <%perl>
-my $rec = $rs->record($i-1);
-my $xc = irspy_xpath_context($rec);
+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,18 +139,19 @@ push @ids, $id;
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
        <td><a href="<% xml_encode("/full.html?id=" . uri_escape($id))
-               %>"><% xml_encode($title) %></a></td>
-       <td><% xml_encode($author) %></td>
-       <td><% xml_encode($host) %></td>
-       <td><% xml_encode($port) %></td>
-       <td><% xml_encode($db) %></td>
+               %>"><% xml_encode($title, "[untitled]") %></a></td>
+       <td><% xml_encode($reliability, "", { nbsp => 1 }) %></td>
+       <td><% xml_encode($host, "") %></td>
+       <td><% xml_encode($port, "") %></td>
+       <td><% xml_encode($db, "") %></td>
        <td>
        <a href="<% xml_encode("/check.html?id=" . uri_escape($id))
-               %>" title="Test this target"><b>T</b></a
-       >&nbsp;<a href="<% xml_encode("/edit.html?id=" . uri_escape($id))
-               %>" title="Edit this target's record"><b>E</b></a
+               %>" title="Test this target">Test</a
+       >&nbsp;<a href="<% xml_encode("/edit.html?op=edit&id=" .
+               uri_escape($id))
+               %>" title="Edit this target's record">Edit</a
        >&nbsp;<a href="<% xml_encode("/raw.html?id=" . uri_escape($id))
-               %>" title="Raw XML record"><b>X</b></a>
+               %>" title="Raw XML record">XML</a>
        </td>
       </tr>
 % }