X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=83801712b4d61e88fe449d553e7b0391b347e3ea;hb=d23ecee8c9a9d5f5caeea406258e4bc8b2c4741e;hp=4bdf8d697eab7d6d44849d90e7d3b5b00125278b;hpb=d6d778988147b7160b2be5099c38fe04f347ac5a;p=irspy-moved-to-github.git diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index 4bdf8d6..8380171 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,9 +1,5 @@ -%# $Id: found.mc,v 1.11 2006-09-25 16:52:30 mike Exp $ +%# $Id: found.mc,v 1.33 2009-04-15 18:16:46 wosch Exp $ <%once> -use XML::LibXML; -use XML::LibXML::XPathContext; -use URI::Escape; - sub print_navlink { my($params, $cond, $caption, $skip) = @_; @@ -23,18 +19,25 @@ sub navlink { 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) { @@ -48,14 +51,24 @@ 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: + $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1"); + $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; @@ -65,7 +78,10 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; %perl> -
% if ($n == 0) { No matches @@ -85,7 +101,8 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);