X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=9e858f862475897d1dd6bf2d817ec84480b0aa87;hb=HEAD;hp=9ede0f4e63588c73c00c799f19c149a3c8f9e90e;hpb=9a2e2890cc2833b0e7bcb55d2f9e40b48c9f067a;p=irspy-moved-to-github.git diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index 9ede0f4..9e858f8 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,19 +1,42 @@ -%# $Id: found.mc,v 1.9 2006-09-23 07:14:05 mike Exp $ <%once> -use XML::LibXML; -use XML::LibXML::XPathContext; +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; +} + +# Just make this once; forge the connection on first use +our $conn = undef; %once> <%perl> -my %params = map { ( $_, $r->param($_)) } grep { $r->param($_) } $r->param(); -my $query = ""; -foreach my $key (keys %params) { - next if $key =~ /^_/; - my $val = $params{$key}; - next if $val eq ""; - $query .= " and " if $query ne ""; - $query .= "$key = ($val)"; +my %params = map { ( $_, utf8param($r, $_)) } grep { &utf8param($r, $_) } &utf8param($r); +my $query; +if ($params{_query}) { + $query = $params{_query}; +} else { + $query = ""; + foreach my $key (keys %params) { + next if $key =~ /^_/; + my $val = $params{$key}; + next if $val eq ""; + $query .= " and " if $query ne ""; + $query .= "$key = ($val)"; + } } -$query = 'cql.allRecords=x' if $query eq ""; +$query = 'cql.allRecords=1' if $query eq ""; my $sort = $params{"_sort"}; if ($sort) { @@ -27,14 +50,25 @@ if ($sort) { $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:3313/IR-Explain---1"); -$conn->option(elementSetName => "zeerex"); -my $parser = new XML::LibXML(); +my $tried_to_open = 0; +if (!defined $conn) { + OPEN: + my $db = ZOOM::IRSpy::connect_to_registry(); + $conn = new ZOOM::Connection($db); + $conn->option(elementSetName => "zeerex"); + $conn->option(count => 20); +} + +my $rs; +eval { $rs = $conn->search(new ZOOM::Query::CQL($query)) }; +if ($@ && ref $@ && $@->isa('ZOOM::Exception') && + $@->code() == ZOOM::Error::CONNECTION_LOST && !$tried_to_open) { + $tried_to_open = 1; + goto OPEN; +} elsif ($@) { + die $@; +} -my $rs = $conn->search(new ZOOM::Query::CQL($query)); my $n = $rs->size(); my $skip = $params{"_skip"} || 0; @@ -44,7 +78,10 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; %perl> -
% if ($n == 0) {
No matches
@@ -54,29 +91,18 @@ $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>
% }
# | Title | -Author | +Host Connection Reliability <& /help/link.mc, help => "info/reliability" &> + | Host | Port | DB | @@ -84,38 +110,49 @@ if ($last < $n) {|||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
<% $i %> | -<% $title %> | -<% $author %> | -<% $host %> | -<% $port %> | -<% $db %> | -">[Test] | -">[Raw] | +"><% xml_encode($title) %> | +<% xml_encode($reliability, "", { nbsp => 1 }) %> | +<% xml_encode($host, "") %> | +<% xml_encode($port, "") %> | +<% xml_encode($db, "") %> | ++ " title="Test this target">Test " title="Edit this target's record">Edit " title="Raw XML record">XML + |