projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Omit empty parameters from prev/next URLs.
[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
a358498
..
eb9fe8f
100644
(file)
--- a/
web/htdocs/details/found.mc
+++ b/
web/htdocs/details/found.mc
@@
-1,10
+1,10
@@
-%# $Id: found.mc,v 1.4 2006-09-19 11:12:33 mike Exp $
+%# $Id: found.mc,v 1.6 2006-09-20 11:25:42 mike Exp $
<%once>
use XML::LibXML;
use XML::LibXML::XPathContext;
</%once>
<%perl>
<%once>
use XML::LibXML;
use XML::LibXML::XPathContext;
</%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 =~ /^_/;
my $query = "";
foreach my $key (keys %params) {
next if $key =~ /^_/;
@@
-15,6
+15,18
@@
foreach my $key (keys %params) {
}
$query = 'cql.allRecords=x' if $query eq "";
}
$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.
### 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.
@@
-32,9
+44,8
@@
my $first = $skip+1;
my $last = $first+$count-1;
$last = $n if $last > $n;
</%perl>
my $last = $first+$count-1;
$last = $n if $last > $n;
</%perl>
+ <h2><% $query %></h2>
<p>
<p>
- <b><% $query %></b>
- <br/>
% if ($n == 0) {
No matches
% } elsif ($first > $n) {
% if ($n == 0) {
No matches
% } elsif ($first > $n) {
@@
-65,6
+76,7
@@
if ($last < $n) {
<tr class="thleft">
<th>#</th>
<th>Title</th>
<tr class="thleft">
<th>#</th>
<th>Title</th>
+ <th>Author</th>
<th>Host</th>
<th>Port</th>
<th>DB</th>
<th>Host</th>
<th>Port</th>
<th>DB</th>
@@
-80,6
+92,7
@@
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 $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 $host = $xc->find("e:serverInfo/e:host");
my $port = $xc->find("e:serverInfo/e:port");
my $db = $xc->find("e:serverInfo/e:database");
@@
-90,6
+103,7
@@
my $id = $xc->find("concat(e:serverInfo/e:host, ':',
<tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
<td><% $i %></td>
<td><% $title %></td>
<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><% $host %></td>
<td><% $port %></td>
<td><% $db %></td>