X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=dfca595f9c4bf12ce0c59f350fad544d6da67b60;hp=2d690a91d17a7af1fd365005a64c00fb9f9411bb;hb=34006aed3916d7c41c4de2811a7451888fcdff22;hpb=d13b3c4a81cd7d20ed47d48d773739d8427c41f4

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index 2d690a9..dfca595 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,54 +1,89 @@
-%# $Id: found.mc,v 1.1 2006-09-15 16:51:51 mike Exp $
+%# $Id: found.mc,v 1.8 2006-09-20 16:37:15 mike Exp $
 <%once>
 use XML::LibXML;
 use XML::LibXML::XPathContext;
 </%once>
 <%perl>
+my %params = map { ( $_, $r->param($_)) } grep { $r->param($_) } $r->param();
 my $query = "";
-foreach my $key ($r->param()) {
+foreach my $key (keys %params) {
     next if $key =~ /^_/;
-    my $val = $r->param($key);
+    my $val = $params{$key};
     next if $val eq "";
     $query .= " and " if $query ne "";
     $query .= "$key = ($val)";
 }
+$query = 'cql.allRecords=x' if $query eq "";
+
+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";
+}
 
 ### 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 $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 $n = $rs->size();
 
-my $skip = $r->param("_skip") || 0;
-my $count = $r->param("_count") || 10;
+my $skip = $params{"_skip"} || 0;
+my $count = $params{"_count"} || 10;
 
 my $first = $skip+1;
 my $last = $first+$count-1;
 $last = $n if $last > $n;
 </%perl>
+     <h2><% $query %></h2>
      <p>
-      <b><% $query %></b>
-      <br/>
 % if ($n == 0) {
       No matches
 % } elsif ($first > $n) {
+%# "Can't happen"
       Past end of <% $n %> records
 % } else {
-      Records <% $first %> to <% $last %> of <% $n %>
+      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];
+}
+</%perl>
 % }
      </p>
 % if ($n > 0 && $first <= $n) {
      <table width="100%">
       <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);
@@ -57,16 +92,30 @@ 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 $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><% $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>
       </tr>
-%}
+% }
      </table>
+     <p>
+      <a href="<% "/check.html?id=" . join(" ", @ids)
+	%>">[Test all targets on this list]</a>
+     </p>
 % }