X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=abf5c01b3cb97c0ad17d750e4359a44b990b8457;hp=2ce16c35522db7e708ad037dc50e3adf6e43bfdb;hb=55c8768f5acb36722ff5bd46f88518d781df274d;hpb=c71448664658234ea1af32fe7ca61bb1d77dce72
diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index 2ce16c3..abf5c01 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,40 +1,38 @@
-%# $Id: full.mc,v 1.14 2006-11-14 16:24:39 mike Exp $
+%# $Id: full.mc,v 1.30 2007-07-03 13:10:50 mike Exp $
<%args>
$id
-<%once>
-use ZOOM;
-
<%perl>
-my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
$conn->option(elementSetName => "zeerex");
-my $qid = $id;
-$qid =~ s/"/\\"/g;
-my $query = qq[rec.id="$qid"];
+my $query = cql_target($id);
my $rs = $conn->search(new ZOOM::Query::CQL($query));
my $n = $rs->size();
if ($n == 0) {
$m->comp("/details/error.mc",
title => "Error", message => "No such ID '$id'");
} else {
- my $rec = $rs->record(0);
- my $xc = irspy_xpath_context($rec);
+ my $xc = irspy_xpath_context($rs->record(0));
my @fields = (
+ [ Name => "e:databaseInfo/e:title",
+ lang => "en", primary => "true" ],
+ [ Country => "i:status/i:country" ],
[ "Last Checked" => "i:status/i:probe[last()]" ],
[ Protocol => "e:serverInfo/\@protocol" ],
[ Host => "e:serverInfo/e:host" ],
[ Port => "e:serverInfo/e:port" ],
[ "Database Name" => "e:serverInfo/e:database" ],
- [ "Username (if needed)" =>
- "e:serverInfo/e:authentication/e:user" ],
- [ "Password (if needed)" =>
- "e:serverInfo/e:authentication/e:password" ],
- [ Title => "e:databaseInfo/e:title",
- lang => "en", primary => "true" ],
+ [ "Type of Library" => "i:status/i:libraryType" ],
+# [ "Username (if needed)" => "e:serverInfo/e:authentication/e:user" ],
+# [ "Password (if needed)" => "e:serverInfo/e:authentication/e:password" ],
+ [ "Server ID" => 'i:status/i:serverImplementationId/@value' ],
+ [ "Server Name" => 'i:status/i:serverImplementationName/@value' ],
+ [ "Server Version" => 'i:status/i:serverImplementationVersion/@value' ],
[ Description => "e:databaseInfo/e:description",
lang => "en", primary => "true" ],
[ Author => "e:databaseInfo/e:author" ],
[ Contact => "e:databaseInfo/e:contact" ],
+ [ "URL to Hosting Organisation" => "i:status/i:hostURL" ],
[ Extent => "e:databaseInfo/e:extent" ],
[ History => "e:databaseInfo/e:history" ],
[ "Language of Records" => "e:databaseInfo/e:langUsage" ],
@@ -43,13 +41,8 @@ if ($n == 0) {
[ "Implementation ID" => "i:status/i:implementationId" ],
[ "Implementation Name" => "i:status/i:implementationName" ],
[ "Implementation Version" => "i:status/i:implementationVersion" ],
- [ "Reliability" => \&calc_reliability, $xc ],
- [ "Services" => sub { "
-### IRSpy does not yet check for search, present, delSet,
-concurrentOperations, namedResultSets, etc. and store the information
-is a usable form. This information should probably be harvested from
-the Init Response.
-" } ],
+ [ "Reliability/reliability" => \&calc_reliability, $xc ],
+ [ "Services" => \&calc_init_options, $xc ],
[ "Bib-1 Use attributes" => \&calc_ap, $xc, "bib-1" ],
[ "Dan-1 Use attributes" => \&calc_ap, $xc, "dan-1" ],
[ "Operators" => \&calc_boolean, $xc ],
@@ -57,32 +50,53 @@ the Init Response.
[ "Record syntaxes" => \&calc_recsyn, $xc ],
[ "Explain" => \&calc_explain, $xc ],
);
+ my $title = $xc->find("e:databaseInfo/e:title");
- <% xml_encode($xc->find("e:databaseInfo/e:title"), "") %>
+ <% xml_encode($title, "") %>
<%perl>
foreach my $ref (@fields) {
my($caption, $xpath, @args) = @$ref;
- my $data;
+ my($data, $linkURL);
if (ref $xpath && ref($xpath) eq "CODE") {
- $data = &$xpath(@args);
+ ($data, $linkURL) = &$xpath($id, @args);
} else {
$data = $xc->find($xpath);
}
if ($data) {
+ print " \n";
+ $caption =~ s/\/(.*)//;
+ my $help = $1;
+ my($linkstart, $linkend) = ("", "");
+ if (defined $linkURL) {
+ $linkstart = '';
+ $linkend = "";
+ }
-
- | <% xml_encode($caption) %> |
- <% xml_encode($data) %> |
+ <% xml_encode($caption) %><%
+ !defined $help ? "" : $m->comp("/help/link.mc", help =>"info/$help")
+ %> |
+ <% $linkstart . xml_encode($data) . $linkend %> |
% }
% }
+
+% my $target = irspy_identifier2target($id);
+% $target =~ s/^tcp://; # Apparently ZAP can't handle the leading "tcp:"
+ ">Search this target.
+
% }
<%perl>
sub calc_reliability {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @allpings = $xc->findnodes("i:status/i:probe");
my $nall = @allpings;
@@ -92,31 +106,41 @@ sub calc_reliability {
return "$nok/$nall = " . int(100*$nok/$nall) . "%";
}
+sub calc_init_options {
+ my($id, $xc) = @_;
+
+ my @ops;
+ my @nodes = $xc->findnodes('e:configInfo/e:supports/@type');
+ foreach my $node (@nodes) {
+ my $type = $node->value();
+ if ($type =~ s/^z3950_//) {
+ push @ops, $type;
+ }
+ }
+
+ return join(", ", @ops);
+}
+
sub calc_ap {
- my($xc, $set) = @_;
+ my($id, $xc, $set) = @_;
- my $expr = 'e:indexInfo/e:index/e:map/e:attr[
- @set = "'.$set.'" and @type = "1"]';
- my @bib1nodes = $xc->findnodes($expr);
- my $nbib1 = @bib1nodes;
- return "[none]" if $nbib1 == 0;
+ my @aps = _list_ap($xc, $set);
+ my $n = @aps;
+ return "[none]" if $n == 0;
my $res = "";
my($first, $last);
- @bib1nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @bib1nodes;
- foreach my $node (@bib1nodes) {
- my $ap .= $node->findvalue(".");
+ foreach my $ap (@aps) {
if (!defined $first) {
- $first = $ap;
- } elsif (!defined $last || $last == $ap-1) {
- $last = $ap;
+ $first = $last = $ap;
+ } elsif ($ap == $last+1) {
+ $last++;
} else {
# Got a complete range
$res .= ", " if $res ne "";
$res .= "$first";
- $res .= "-$last" if defined $last;
- $first = $ap;
- $last = undef;
+ $res .= "-$last" if $last > $first;
+ $first = $last = $ap;
}
}
@@ -124,14 +148,24 @@ sub calc_ap {
if (defined $first) {
$res .= ", " if $res ne "";
$res .= "$first";
- $res .= "-$last" if defined $last;
+ $res .= "-$last" if $last > $first;
}
- return "$nbib1 access points: $res";
+ return ("$n access points: $res",
+ "/ap.html?id=$id&set=$set");
+}
+
+sub _list_ap {
+ my($xc, $set) = @_;
+
+ my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
+ @set = "'.$set.'" and @type = "1"]';
+ my @nodes = $xc->findnodes($expr);
+ return sort { $a <=> $b } map { $_->findvalue(".") } @nodes;
}
sub calc_boolean {
- my($xc) = @_;
+ my($id, $xc) = @_;
### Note that we are currently interrogating an IRSpy extension.
# The standard ZeeRex record should be extended with a
@@ -143,28 +177,28 @@ sub calc_boolean {
}
sub calc_nrs {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
return @nodes ? "Yes" : "No";
}
sub calc_recsyn {
- my($xc) = @_;
+ my($id, $xc, $sep) = @_;
+ $sep = ", " if !defined $sep;
my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
- my $res = join(", ", map { $_->findvalue('@name') } @nodes);
+ my $res = join($sep, map { $_->findvalue('@name') } @nodes);
$res = "[none]" if $res eq "";
return $res;
}
sub calc_explain {
- my($xc) = @_;
+ my($id, $xc) = @_;
my @nodes = $xc->findnodes('i:status/i:explain[@ok = "1"]');
my $res = join(", ", map { $_->findvalue('@category') } @nodes);
$res = "[none]" if $res eq "";
return $res;
}
-