Use utf8param($r, $key) instead of $r->param($key) throughout.

[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 3247f23..dc7caee 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,4 +1,4 @@
-%# $Id: found.mc,v 1.25 2007-01-24 09:28:02 mike Exp $
+%# $Id: found.mc,v 1.30 2007-05-03 14:15:56 mike Exp $
 <%once>
 sub print_navlink {
     my($params, $cond, $caption, $skip) = @_;
@@ -38,7 +38,7 @@ sub calc_reliability {
 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};
@@ -115,7 +115,8 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
       <tr class="thleft">
        <th>#</th>
        <th>Title</th>
-       <th>Reliability</th>
+       <th>Reliability <& /help/link.mc, help => "info/reliability" &>
+       </th>
        <th>Host</th>
        <th>Port</th>
        <th>DB</th>
@@ -126,28 +127,26 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
 % foreach my $i ($first .. $last) {
 <%perl>
 my $xc = irspy_xpath_context($rs->record($i-1));
-my $title = $xc->find("e:databaseInfo/e:title");
+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;
 </%perl>
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
        <td><a href="<% xml_encode("/full.html?id=" . uri_escape($id))
-               %>"><% xml_encode($title, "[untitled]") %></a></td>
+               %>"><% xml_encode($title) %></a></td>
        <td><% xml_encode($reliability, "", { nbsp => 1 }) %></td>
        <td><% xml_encode($host, "") %></td>
        <td><% xml_encode($port, "") %></td>
        <td><% xml_encode($db, "") %></td>
        <td>
-       <a href="<% xml_encode("/check.html?id=" . uri_escape($id))
+       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id))
                %>" title="Test this target">Test</a
-       >&nbsp;<a href="<% xml_encode("/edit.html?op=edit&id=" .
+       >&nbsp;<a href="<% xml_encode("/admin/edit.html?op=edit&id=" .
                uri_escape($id))
                %>" title="Edit this target's record">Edit</a
        >&nbsp;<a href="<% xml_encode("/raw.html?id=" . uri_escape($id))
@@ -161,7 +160,7 @@ print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0);
 print_navlink(\%params, $last < $n, "Next", $skip+$count);
 </%perl>
      <p>
-      <a href="<% "/check.html?" .
+      <a href="<% "/admin/check.html?" .
        xml_encode(join("&", map { "id=" . uri_escape($_) } @ids))
        %>">[Test all targets on this list]</a>
      </p>