X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=dc7caeebff04aec40e3edea7cc5d6b18d90e58d8;hb=935768897bb39ec321f9918e26e2fddfdbcd08ac;hp=84f8514c2442e5fff9568f69188bb92b5dabcfdb;hpb=e198a666add1f459306898ef0fbcb64b825fdb6b;p=irspy-moved-to-github.git diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index 84f8514..dc7caee 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,9 +1,5 @@ -%# $Id: found.mc,v 1.13 2006-10-18 12:36:05 mike Exp $ +%# $Id: found.mc,v 1.30 2007-05-03 14:15:56 mike Exp $ <%once> -use XML::LibXML; -use XML::LibXML::XPathContext; -use URI::Escape; - sub print_navlink { my($params, $cond, $caption, $skip) = @_; @@ -23,11 +19,26 @@ sub navlink { return $url; } +# Identical to the same-named function in full.mc +# So maybe this should go into IRSpy::Utils.pm? +# +sub calc_reliability { + my($xc) = @_; + + my @allpings = $xc->findnodes("i:status/i:probe"); + my $nall = @allpings; + return "[untested]" if $nall == 0; + my @okpings = $xc->findnodes('i:status/i:probe[@ok = "1"]'); + my $nok = @okpings; + return "$nok/$nall = " . int(100*$nok/$nall) . "%"; +} + + # 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 %params = map { ( $_, utf8param($r, $_)) } grep { $r->param($_) } $r->param(); my $query; if ($params{_query}) { $query = $params{_query}; @@ -41,7 +52,7 @@ if ($params{_query}) { $query .= "$key = ($val)"; } } -$query = 'cql.allRecords=x' if $query eq ""; +$query = 'cql.allRecords=1' if $query eq ""; my $sort = $params{"_sort"}; if ($sort) { @@ -55,13 +66,23 @@ if ($sort) { $query .= " 0"; } +my $tried_to_open = 0; if (!defined $conn) { - $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1"); + OPEN: + $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1"); + $conn->option(elementSetName => "zeerex"); +} + +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; @@ -71,10 +92,10 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; %perl> -
+% if ($n == 0) { No matches @@ -94,7 +115,8 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);