If _query parameter is set, use that verbatim rather than assembling a

[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 4bdf8d6..84f8514 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,4 +1,4 @@
-%# $Id: found.mc,v 1.11 2006-09-25 16:52:30 mike Exp $
+%# $Id: found.mc,v 1.13 2006-10-18 12:36:05 mike Exp $
 <%once>
 use XML::LibXML;
 use XML::LibXML::XPathContext;
@@ -23,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 "";
 
@@ -48,10 +55,9 @@ 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");
+if (!defined $conn) {
+    $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+}
 $conn->option(elementSetName => "zeerex");
 my $parser = new XML::LibXML();
 
@@ -65,7 +71,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