X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=eb9fe8f28a91c7848a2217b68f29fa427b92bb99;hb=edcb616095524e5aa81c7e7dd126d50b69ef9997;hp=a3584985ade8a9b818769e955e1091d1a01b9d44;hpb=d029b61211d488577a69ea961918421eb6313ec4;p=irspy-moved-to-github.git diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index a358498..eb9fe8f 100644 --- 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; <%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,6 +15,18 @@ foreach my $key (keys %params) { } $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. @@ -32,9 +44,8 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; +

<% $query %>

- <% $query %> -
% if ($n == 0) { No matches % } elsif ($first > $n) { @@ -65,6 +76,7 @@ if ($last < $n) { # Title + Author Host Port DB @@ -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 $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"); @@ -90,6 +103,7 @@ my $id = $xc->find("concat(e:serverInfo/e:host, ':', <% $i %> <% $title %> + <% $author %> <% $host %> <% $port %> <% $db %>