X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=231f4d10423049fcfb6d41f38f23da9f8582a46f;hp=ebe7367de7356477ca76fb466bfe6a68668e23c5;hb=5be3dea6bacf251661cfa9b3317b3b62e01da295;hpb=05f0f9a23153e0762f42fae414d41ae52543ae0f

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index ebe7367..231f4d1 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,7 +1,5 @@
-%# $Id: found.mc,v 1.15 2006-10-20 16:57:23 mike Exp $
+%# $Id: found.mc,v 1.33 2009-04-15 18:16:46 wosch Exp $
 <%once>
-use URI::Escape;
-
 sub print_navlink {
     my($params, $cond, $caption, $skip) = @_;
 
@@ -21,11 +19,27 @@ sub navlink {
     return $url;
 }
 
+# Identical to the same-named function in full.mc
+# So maybe this should go into IRSpy::Utils.pm?
+# Name changed (append 2) to prevent inadvertent clashes in Mason namespace
+#
+sub calc_reliability2 {
+    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>
 <%perl>
-my %params = map { ( $_, $r->param($_)) } grep { $r->param($_) } $r->param();
+my %params = map { ( $_, utf8param($r, $_)) } grep { &utf8param($r, $_) } &utf8param($r);
 my $query;
 if ($params{_query}) {
     $query = $params{_query};
@@ -39,7 +53,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) {
@@ -56,7 +70,7 @@ if ($sort) {
 my $tried_to_open = 0;
 if (!defined $conn) {
   OPEN:
-    $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+    $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
     $conn->option(elementSetName => "zeerex");
 }
 
@@ -79,10 +93,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
@@ -102,7 +116,8 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
       <tr class="thleft">
        <th>#</th>
        <th>Title</th>
-       <th>Author</th>
+       <th>Host Connection Reliability <& /help/link.mc, help => "info/reliability" &>
+       </th>
        <th>Host</th>
        <th>Port</th>
        <th>DB</th>
@@ -112,33 +127,31 @@ 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 $title = $xc->find("e:databaseInfo/e:title");
-my $author = $xc->find("e:databaseInfo/e:author");
+my $xc = irspy_xpath_context($rs->record($i-1));
+my $title = $xc->find("e:databaseInfo/e:title") || "[UNTITLED]";
+my $reliability = calc_reliability2($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");
-my $id = $xc->find("concat(e:serverInfo/e:host, ':',
-                           e:serverInfo/e:port, '/',
-                           e:serverInfo/e:database)");
+my $id = irspy_record2identifier($xc);
 push @ids, $id;
 </%perl>
       <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>
+       <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
+	<a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id))
+		%>" title="Test this target">Test</a
+	>&nbsp;<a href="<% xml_encode("/admin/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>
 % }
@@ -148,8 +161,12 @@ print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0);
 print_navlink(\%params, $last < $n, "Next", $skip+$count);
 </%perl>
      <p>
-      <a href="<% "/check.html?" .
+      <a href="<% "/admin/check.html?" .
 	xml_encode(join("&", map { "id=" . uri_escape($_) } @ids))
 	%>">[Test all targets on this list]</a>
      </p>
+     <p>
+      <a href="<% "/stats.html?query=" . xml_encode(uri_escape($query))
+	%>">[Statistics for targets on this list]</a>
+     </p>
 % }