X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=da1e53ef1bd7b175b0a022e5697702591f6a0786;hb=22b72da58083aeda259ab7cb79f50f32106dc1b9;hp=c502dd11827be3ba157a2feb6efde8fd513dffac;hpb=d205976815c1e4241a8f712b45bfe7a87e9886c2;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index c502dd1..da1e53e 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,10 +1,5 @@
-%# $Id: found.mc,v 1.10 2006-09-25 14:58:20 mike Exp $
+%# $Id: found.mc,v 1.17 2006-10-27 00:47:05 mike Exp $
 <%once>
-use XML::LibXML;
-use XML::LibXML::XPathContext;
-use ZOOM::IRSpy::Record qw(xml_encode);
-use URI::Escape;
-
 sub print_navlink {
     my($params, $cond, $caption, $skip) = @_;
 
@@ -24,16 +19,23 @@ sub navlink {
     return $url;
 }
 
+# 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 $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)";
+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 "";
 
@@ -49,14 +51,23 @@ if ($sort) {
     $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:3313/IR-Explain---1");
-$conn->option(elementSetName => "zeerex");
-my $parser = new XML::LibXML();
+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 $@;
+}
 
-my $rs = $conn->search(new ZOOM::Query::CQL($query));
 my $n = $rs->size();
 
 my $skip = $params{"_skip"} || 0;
@@ -66,7 +77,10 @@ my $first = $skip+1;
 my $last = $first+$count-1;
 $last = $n if $last > $n;
 </%perl>
-     <h2><% xml_encode($query) %></h2>
+     <form method="get" action="">
+      <input type="text" name="_query" size="60" value="<% xml_encode($query) %>"/>
+      <input type="submit" name="_search" value="Search"/>
+     </form>
      <p>
 % if ($n == 0) {
       No matches
@@ -97,11 +111,7 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
 % 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($rec);
 my $title = $xc->find("e:databaseInfo/e:title");
 my $author = $xc->find("e:databaseInfo/e:author");
 my $host = $xc->find("e:serverInfo/e:host");
@@ -114,15 +124,20 @@ push @ids, $id;
 </%perl>
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
-       <td><% xml_encode($title) %></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><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("/check.html?id=" . uri_escape($id))
+		%>" title="Test this target">Test</a
+	>&nbsp;<a href="<% xml_encode("/edit.html?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>