projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less verbose output, configurable
[irspy-moved-to-github.git]
/
web
/
htdocs
/
details
/
found.mc
diff --git
a/web/htdocs/details/found.mc
b/web/htdocs/details/found.mc
index
d4b6d66
..
13143c6
100644
(file)
--- a/
web/htdocs/details/found.mc
+++ b/
web/htdocs/details/found.mc
@@
-1,4
+1,4
@@
-%# $Id: found.mc,v 1.27 2007-02-22 11:49:46 mike Exp $
+%# $Id: found.mc,v 1.33 2009-04-15 18:16:46 wosch Exp $
<%once>
sub print_navlink {
my($params, $cond, $caption, $skip) = @_;
<%once>
sub print_navlink {
my($params, $cond, $caption, $skip) = @_;
@@
-21,8
+21,9
@@
sub navlink {
# Identical to the same-named function in full.mc
# So maybe this should go into IRSpy::Utils.pm?
# Identical to the same-named function in full.mc
# So maybe this should go into IRSpy::Utils.pm?
+# Name changed (append 2) to prevent inadvertent clashes in Mason namespace
#
#
-sub calc_reliability {
+sub calc_reliability2 {
my($xc) = @_;
my @allpings = $xc->findnodes("i:status/i:probe");
my($xc) = @_;
my @allpings = $xc->findnodes("i:status/i:probe");
@@
-38,7
+39,7
@@
sub calc_reliability {
our $conn = undef;
</%once>
<%perl>
our $conn = undef;
</%once>
<%perl>
-my %params = map { ( $_, $r->param($_)) } grep { $r->param($_) } $r->param();
+my %params = map { ( $_, utf8param($r, $_)) } grep { &utf8param($r, $_) } &utf8param($r);
my $query;
if ($params{_query}) {
$query = $params{_query};
my $query;
if ($params{_query}) {
$query = $params{_query};
@@
-71,6
+72,7
@@
if (!defined $conn) {
OPEN:
$conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
$conn->option(elementSetName => "zeerex");
OPEN:
$conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
$conn->option(elementSetName => "zeerex");
+ $conn->option(count => 20);
}
my $rs;
}
my $rs;
@@
-115,7
+117,8
@@
print_navlink(\%params, $last < $n, "Next", $skip+$count);
<tr class="thleft">
<th>#</th>
<th>Title</th>
<tr class="thleft">
<th>#</th>
<th>Title</th>
- <th>Reliability</th>
+ <th>Host Connection Reliability <& /help/link.mc, help => "info/reliability" &>
+ </th>
<th>Host</th>
<th>Port</th>
<th>DB</th>
<th>Host</th>
<th>Port</th>
<th>DB</th>
@@
-123,17
+126,16
@@
print_navlink(\%params, $last < $n, "Next", $skip+$count);
<th></th>
</tr>
% my @ids;
<th></th>
</tr>
% my @ids;
+% $rs->records($first-1, $last-$first+1); ## Force pre-cache
% foreach my $i ($first .. $last) {
<%perl>
my $xc = irspy_xpath_context($rs->record($i-1));
my $title = $xc->find("e:databaseInfo/e:title") || "[UNTITLED]";
% foreach my $i ($first .. $last) {
<%perl>
my $xc = irspy_xpath_context($rs->record($i-1));
my $title = $xc->find("e:databaseInfo/e:title") || "[UNTITLED]";
-my $reliability = calc_reliability($xc);
+my $reliability = calc_reliability2($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 $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;
</%perl>
<tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
push @ids, $id;
</%perl>
<tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">