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=9ede0f4e63588c73c00c799f19c149a3c8f9e90e;hb=d062a7adf8b80d4bc0869491113787d45b5ad0d3;hpb=59dd486c8de1708d6492acb8908350cff2a97e65

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index 9ede0f4..c306375 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,17 +1,45 @@
-%# $Id: found.mc,v 1.9 2006-09-23 07:14:05 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 %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 "";
 
@@ -27,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;
@@ -44,7 +82,10 @@ my $first = $skip+1;
 my $last = $first+$count-1;
 $last = $n if $last > $n;
 </%perl>
-     <h2><% $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
@@ -54,20 +95,8 @@ $last = $n if $last > $n;
 % } else {
       Records <% $first %> to <% $last %> of <% $n %><br/>
 <%perl>
-if ($skip > 0) {
-    $params{_skip} = $count < $skip ? $skip-$count : 0;
-    my $prev = "?" . join("&", map { "$_=" . $params{$_}  } sort keys %params);
-    print qq[     <a href="$prev">Prev</a>\n];
-} else {
-    print qq[     <span class="disabled">Prev</span>\n];
-}
-if ($last < $n) {
-    $params{_skip} = $skip+$count;
-    my $next = "?" . join("&", map { "$_=" . $params{$_}  } sort keys %params);
-    print qq[     <a href="$next">Next</a>\n];
-} else {
-    print qq[     <span class="disabled">Next</span>\n];
-}
+print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0);
+print_navlink(\%params, $last < $n, "Next", $skip+$count);
 </%perl>
 % }
      </p>
@@ -104,18 +133,25 @@ push @ids, $id;
 </%perl>
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
-       <td><% $title %></td>
-       <td><% $author %></td>
-       <td><% $host %></td>
-       <td><% $port %></td>
-       <td><% $db %></td>
-       <td><a href="<% "/check.html?id=$id" %>">[Test]</a></td>
-       <td><a href="<% "/raw.html?id=$id" %>">[Raw]</a></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?" . join("&", map { "id=$_" } @ids)
+      <a href="<% "/check.html?" .
+	xml_encode(join("&", map { "id=" . uri_escape($_) } @ids))
 	%>">[Test all targets on this list]</a>
      </p>
 % }