X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=7e1eb0ab94027c318b29e2b20b3fa3f6df1af6d3;hb=df8043ca3393100e8dd8ab2758ffe551b53577a8;hp=84f8514c2442e5fff9568f69188bb92b5dabcfdb;hpb=d8692d0e56ed88b5fdb6224d69b2b3a11cbeb2b8;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index 84f8514..7e1eb0a 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,9 +1,5 @@
-%# $Id: found.mc,v 1.13 2006-10-18 12:36:05 mike Exp $
+%# $Id: found.mc,v 1.22 2006-12-05 17:18:30 mike Exp $
 <%once>
-use XML::LibXML;
-use XML::LibXML::XPathContext;
-use URI::Escape;
-
 sub print_navlink {
     my($params, $cond, $caption, $skip) = @_;
 
@@ -23,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>
@@ -55,13 +66,23 @@ if ($sort) {
     $query .= " 0";
 }
 
+my $tried_to_open = 0;
 if (!defined $conn) {
+  OPEN:
     $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+    $conn->option(elementSetName => "zeerex");
+}
+
+my $rs;
+eval { $rs = $conn->search(new ZOOM::Query::CQL($query)) };
+if ($@ && ref $@ && $@->isa('ZOOM::Exception') &&
+    $@->code() == ZOOM::Error::CONNECTION_LOST && !$tried_to_open) {
+    $tried_to_open = 1;
+    goto OPEN;
+} elsif ($@) {
+    die $@;
 }
-$conn->option(elementSetName => "zeerex");
-my $parser = new XML::LibXML();
 
-my $rs = $conn->search(new ZOOM::Query::CQL($query));
 my $n = $rs->size();
 
 my $skip = $params{"_skip"} || 0;
@@ -71,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
@@ -94,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>
@@ -104,14 +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 $xml = $rec->render();
-my $doc = $parser->parse_string($xml);
-my $root = $doc->getDocumentElement();
-my $xc = XML::LibXML::XPathContext->new($root);
-$xc->registerNs(e => 'http://explain.z3950.org/dtd/2.0/');
+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");
@@ -122,15 +138,21 @@ push @ids, $id;
 </%perl>
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
-       <td><% xml_encode($title) %></td>
-       <td><% xml_encode($author) %></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))
-	%>">[Test]</a></td>
-       <td><a href="<% xml_encode("/raw.html?id=" . uri_escape($id))
-	%>">[Raw]</a></td>
+       <td><a href="<% xml_encode("/full.html?id=" . uri_escape($id))
+		%>"><% 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">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">XML</a>
+       </td>
       </tr>
 % }
      </table>