X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffound.mc;h=e4312fb69e086c933b9ecb2c95dc118c5e48c827;hb=929666f7a7c53e064045212a810a28faf2ecc6d8;hp=c3063753ab999a41253cd5857db677f2a6ffb631;hpb=d062a7adf8b80d4bc0869491113787d45b5ad0d3;p=irspy-moved-to-github.git
diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index c306375..e4312fb 100644
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -1,9 +1,4 @@
-%# $Id: found.mc,v 1.14 2006-10-18 14:03:42 mike Exp $
<%once>
-use XML::LibXML;
-use XML::LibXML::XPathContext;
-use URI::Escape;
-
sub print_navlink {
my($params, $cond, $caption, $skip) = @_;
@@ -27,7 +22,7 @@ sub navlink {
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};
@@ -41,7 +36,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) {
@@ -58,10 +53,11 @@ if ($sort) {
my $tried_to_open = 0;
if (!defined $conn) {
OPEN:
- $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+ my $db = ZOOM::IRSpy::connect_to_registry();
+ $conn = new ZOOM::Connection($db);
$conn->option(elementSetName => "zeerex");
+ $conn->option(count => 20);
}
-my $parser = new XML::LibXML();
my $rs;
eval { $rs = $conn->search(new ZOOM::Query::CQL($query)) };
@@ -82,10 +78,10 @@ my $first = $skip+1;
my $last = $first+$count-1;
$last = $n if $last > $n;
%perl>
-
+
% if ($n == 0) {
No matches
@@ -105,7 +101,8 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
# |
Title |
- Author |
+ Host Connection Reliability <& /help/link.mc, help => "info/reliability" &>
+ |
Host |
Port |
DB |
@@ -113,35 +110,35 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
|
% my @ids;
+% $rs->records($first-1, $last-$first+1); ## Force pre-cache
% 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_string($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>
<% $i %> |
- <% xml_encode($title) %> |
- <% xml_encode($author) %> |
- <% xml_encode($host) %> |
- <% xml_encode($port) %> |
- <% xml_encode($db) %> |
- ">[Test] |
- ">[Raw] |
+ "><% xml_encode($title) %> |
+ <% xml_encode($reliability, "", { nbsp => 1 }) %> |
+ <% xml_encode($host, "") %> |
+ <% xml_encode($port, "") %> |
+ <% xml_encode($db, "") %> |
+
+ " title="Test this target">Test " title="Edit this target's record">Edit " title="Raw XML record">XML
+ |
% }
@@ -150,8 +147,12 @@ print_navlink(\%params, $skip > 0, "Prev", $count < $skip ? $skip-$count : 0);
print_navlink(\%params, $last < $n, "Next", $skip+$count);
%perl>
- ">[Test all targets on this list]
+
+ ">[Statistics for targets on this list]
+
% }