Attempt, once only, to re-open a closed zconn.

[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 2d690a9..c306375 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,54 +1,118 @@
-%# $Id: found.mc,v 1.1 2006-09-15 16:51:51 mike Exp $
+%# $Id: found.mc,v 1.14 2006-10-18 14:03:42 mike Exp $
 <%once>
 use XML::LibXML;
 use XML::LibXML::XPathContext;
+use URI::Escape;
+
+sub print_navlink {
+    my($params, $cond, $caption, $skip) = @_;
+
+    if ($cond) {
+       print('     <a href="', navlink($params, $caption, $skip),
+             '"', ">$caption</a>\n");
+    } else {
+       print qq[     <span class="disabled">$caption</span>\n];
+    }
+}
+
+sub navlink {
+    my($params, $caption, $skip) = @_;
+    local $params->{_skip} = $skip;
+    my $url = "?" . join("&", map { "$_=" . $params->{$_}  } sort keys %$params);
+    $url = xml_encode($url);
+    return $url;
+}
+
+# Just make this once; forge the connection on first use
+our $conn = undef;
 </%once>
 <%perl>
-my $query = "";
-foreach my $key ($r->param()) {
-    next if $key =~ /^_/;
-    my $val = $r->param($key);
-    next if $val eq "";
-    $query .= " and " if $query ne "";
-    $query .= "$key = ($val)";
+my %params = map { ( $_, $r->param($_)) } grep { $r->param($_) } $r->param();
+my $query;
+if ($params{_query}) {
+    $query = $params{_query};
+} else {
+    $query = "";
+    foreach my $key (keys %params) {
+       next if $key =~ /^_/;
+       my $val = $params{$key};
+       next if $val eq "";
+       $query .= " and " if $query ne "";
+       $query .= "$key = ($val)";
+    }
+}
+$query = 'cql.allRecords=x' if $query eq "";
+
+my $sort = $params{"_sort"};
+if ($sort) {
+    my $modifiers = "";
+    if ($sort =~ s/(\/.*)//) {
+       $modifiers = $1;
+    }
+    $query .= " or $sort=/sort";
+    $query .= "-desc" if $params{_desc};
+    $query .= $modifiers;
+    $query .= " 0";
 }
 
-### We can think about keeping the Connection object open to re-use
-# for multiple requests, but that may not get us much.  Same applies
-# for the XML parser.
-my $conn = new ZOOM::Connection("localhost:1313/IR-Explain---1");
-$conn->option(elementSetName => "zeerex");
+my $tried_to_open = 0;
+if (!defined $conn) {
+  OPEN:
+    $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+    $conn->option(elementSetName => "zeerex");
+}
 my $parser = new XML::LibXML();
 
-my $rs = $conn->search(new ZOOM::Query::CQL($query));
+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 $@;
+}
+
 my $n = $rs->size();
 
-my $skip = $r->param("_skip") || 0;
-my $count = $r->param("_count") || 10;
+my $skip = $params{"_skip"} || 0;
+my $count = $params{"_count"} || 10;
 
 my $first = $skip+1;
 my $last = $first+$count-1;
 $last = $n if $last > $n;
 </%perl>
+     <form method="get" action="">
+      <input type="text" name="_query" size="60" value="<% xml_encode($query) %>"/>
+      <input type="submit" name="_search" value="Search"/>
+     </form>
      <p>
-      <b><% $query %></b>
-      <br/>
 % if ($n == 0) {
       No matches
 % } elsif ($first > $n) {
+%# "Can't happen"
       Past end of <% $n %> records
 % } else {
-      Records <% $first %> to <% $last %> of <% $n %>
+      Records <% $first %> to <% $last %> of <% $n %><br/>
+<%perl>
+print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0);
+print_navlink(\%params, $last < $n, "Next", $skip+$count);
+</%perl>
 % }
      </p>
 % if ($n > 0 && $first <= $n) {
      <table width="100%">
       <tr class="thleft">
        <th>#</th>
+       <th>Title</th>
+       <th>Author</th>
        <th>Host</th>
        <th>Port</th>
        <th>DB</th>
+       <th></th>
+       <th></th>
       </tr>
+% my @ids;
 % foreach my $i ($first .. $last) {
 <%perl>
 my $rec = $rs->record($i-1);
@@ -57,16 +121,37 @@ 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 $title = $xc->find("e:databaseInfo/e:title");
+my $author = $xc->find("e:databaseInfo/e:author");
 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)");
+push @ids, $id;
 </%perl>
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
-       <td><% $host %></td>
-       <td><% $port %></td>
-       <td><% $db %></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>
       </tr>
-%}
+% }
      </table>
+<%perl>
+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?" .
+       xml_encode(join("&", map { "id=" . uri_escape($_) } @ids))
+       %>">[Test all targets on this list]</a>
+     </p>
 % }