X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=4bdf8d697eab7d6d44849d90e7d3b5b00125278b;hb=d6d778988147b7160b2be5099c38fe04f347ac5a;hp=e957091f3a16f8658d5605e6da3fd2ea36f0a807;hpb=f07da2fa4daa7525e39a42d417cd68ac6fc83d30;p=irspy-moved-to-github.git diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index e957091..4bdf8d6 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,10 +1,31 @@ -%# $Id: found.mc,v 1.5 2006-09-19 16:35:25 mike Exp $ +%# $Id: found.mc,v 1.11 2006-09-25 16:52:30 mike Exp $ <%once> use XML::LibXML; use XML::LibXML::XPathContext; +use URI::Escape; + +sub print_navlink { + my($params, $cond, $caption, $skip) = @_; + + if ($cond) { + print(' $caption\n"); + } else { + print qq[ $caption\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; +} + %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 =~ /^_/; @@ -17,15 +38,20 @@ $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(); @@ -39,7 +65,7 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; %perl> -
% if ($n == 0) {
No matches
@@ -49,20 +75,8 @@ $last = $n if $last > $n;
% } else {
Records <% $first %> to <% $last %> of <% $n %>
<%perl>
-if ($skip > 0) {
- $params{_skip} = $count < $skip ? $skip-$count : 0;
- my $prev = "?" . join("&", map { "$_=" . $params{$_} } sort keys %params);
- print qq[ Prev\n];
-} else {
- print qq[ Prev\n];
-}
-if ($last < $n) {
- $params{_skip} = $skip+$count;
- my $next = "?" . join("&", map { "$_=" . $params{$_} } sort keys %params);
- print qq[ Next\n];
-} else {
- print qq[ Next\n];
-}
+print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0);
+print_navlink(\%params, $last < $n, "Next", $skip+$count);
%perl>
% }