X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=e4312fb69e086c933b9ecb2c95dc118c5e48c827;hp=ecb4d70f9ec1cd3f0ad2041d47d3b65e493e338c;hb=f0030d177f58f280c6cd1019f9e26b81f9f8cbda;hpb=83e8406f04599be5d205da37e8b8982c97256eeb diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index ecb4d70..e4312fb 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,9 +1,4 @@ -%# $Id: found.mc,v 1.12 2006-10-17 14:49:58 mike Exp $ <%once> -use XML::LibXML; -use XML::LibXML::XPathContext; -use URI::Escape; - sub print_navlink { my($params, $cond, $caption, $skip) = @_; @@ -27,16 +22,21 @@ sub navlink { 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) { @@ -50,13 +50,25 @@ if ($sort) { $query .= " 0"; } +my $tried_to_open = 0; if (!defined $conn) { - $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1"); + 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 $@; } -$conn->option(elementSetName => "zeerex"); -my $parser = new XML::LibXML(); -my $rs = $conn->search(new ZOOM::Query::CQL($query)); my $n = $rs->size(); my $skip = $params{"_skip"} || 0; @@ -66,7 +78,10 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; %perl> -
% if ($n == 0) { No matches @@ -86,7 +101,8 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);