X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=dc7caeebff04aec40e3edea7cc5d6b18d90e58d8;hp=f7f8799447713ec21aa96573d4686287abc55f94;hb=c1c34528dbc95608f3dd6f6e32ab7dc97e53699e;hpb=73d42e40d6ca0dcb11a4c513c340d5158268ed07 diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc index f7f8799..dc7caee 100644 --- a/web/htdocs/details/found.mc +++ b/web/htdocs/details/found.mc @@ -1,19 +1,58 @@ -%# $Id: found.mc,v 1.7 2006-09-20 13:19:53 mike Exp $ +%# $Id: found.mc,v 1.30 2007-05-03 14:15:56 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; +} + +# 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; <%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 { $r->param($_) } $r->param(); +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 +66,23 @@ 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"); +} + +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 +92,10 @@ my $first = $skip+1; my $last = $first+$count-1; $last = $n if $last > $n; -

<% $query %>

+

+ + +

% if ($n == 0) { No matches @@ -54,20 +105,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); % }

@@ -76,40 +115,57 @@ if ($last < $n) { # Title - Author + Reliability <& /help/link.mc, help => "info/reliability" &> + Host Port DB +% my @ids; % foreach my $i ($first .. $last) { <%perl> -my $rec = $rs->record($i-1); -my $xml = $rec->render(); -my $doc = $parser->parse_string($xml); -my $root = $doc->getDocumentElement(); -my $xc = XML::LibXML::XPathContext->new($root); -$xc->registerNs(e => 'http://explain.z3950.org/dtd/2.0/'); -my $title = $xc->find("e:databaseInfo/e:title"); -my $author = $xc->find("e:databaseInfo/e:author"); +my $xc = irspy_xpath_context($rs->record($i-1)); +my $title = $xc->find("e:databaseInfo/e:title") || "[UNTITLED]"; +my $reliability = calc_reliability($xc); my $host = $xc->find("e:serverInfo/e:host"); my $port = $xc->find("e:serverInfo/e:port"); my $db = $xc->find("e:serverInfo/e:database"); -my $id = $xc->find("concat(e:serverInfo/e:host, ':', - e:serverInfo/e:port, '/', - e:serverInfo/e:database)"); +my $id = irspy_record2identifier($xc); +push @ids, $id; <% $i %> - <% $title %> - <% $author %> - <% $host %> - <% $port %> - <% $db %> - ">[Check] - ">[Raw] + <% xml_encode($title) %> + <% xml_encode($reliability, "", { nbsp => 1 }) %> + <% xml_encode($host, "") %> + <% xml_encode($port, "") %> + <% xml_encode($db, "") %> + + Test " title="Edit this target's record">Edit XML + -%} +% } +<%perl> +print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0); +print_navlink(\%params, $last < $n, "Next", $skip+$count); + +

+ [Test all targets on this list] +

+

+ [Statistics for targets on this list] +

% }