X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=ecb4d70f9ec1cd3f0ad2041d47d3b65e493e338c;hb=1b3a1c567fabca9cafa6cf556d3ee9b273724a86;hp=a3584985ade8a9b818769e955e1091d1a01b9d44;hpb=4da9c82345c2a97a927391aefdf78c5db5e9801c;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index a358498..ecb4d70 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,10 +1,33 @@
-%# $Id: found.mc,v 1.4 2006-09-19 11:12:33 mike Exp $
+%# $Id: found.mc,v 1.12 2006-10-17 14:49:58 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($_)) } $r->param();
+my %params = map { ( $_, $r->param($_)) } grep { $r->param($_) } $r->param();
 my $query = "";
 foreach my $key (keys %params) {
     next if $key =~ /^_/;
@@ -15,10 +38,21 @@ foreach my $key (keys %params) {
 }
 $query = 'cql.allRecords=x' if $query eq "";
 
-### 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");
+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";
+}
+
+if (!defined $conn) {
+    $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+}
 $conn->option(elementSetName => "zeerex");
 my $parser = new XML::LibXML();
 
@@ -32,9 +66,8 @@ my $first = $skip+1;
 my $last = $first+$count-1;
 $last = $n if $last > $n;
 </%perl>
+     <h2><% xml_encode($query) %></h2>
      <p>
-      <b><% $query %></b>
-      <br/>
 % if ($n == 0) {
       No matches
 % } elsif ($first > $n) {
@@ -43,20 +76,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>
@@ -65,12 +86,14 @@ if ($last < $n) {
       <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);
@@ -80,22 +103,36 @@ 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><% $title %></td>
-       <td><% $host %></td>
-       <td><% $port %></td>
-       <td><% $db %></td>
-       <td><a href="<% "/check.html?id=$id" %>">[Check]</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?" .
+	xml_encode(join("&", map { "id=" . uri_escape($_) } @ids))
+	%>">[Test all targets on this list]</a>
+     </p>
 % }