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

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index c502dd1..c306375 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,8 +1,7 @@
-%# $Id: found.mc,v 1.10 2006-09-25 14:58:20 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 ZOOM::IRSpy::Record qw(xml_encode);
 use URI::Escape;
 
 sub print_navlink {
@@ -24,16 +23,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 +55,24 @@ 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 $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 = $params{"_skip"} || 0;
@@ -66,7 +82,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