-%# $Id: full.mc,v 1.17 2006-11-16 17:12:30 mike Exp $
+%# $Id: full.mc,v 1.22 2007-02-02 11:31:30 mike Exp $
<%args>
$id
</%args>
<%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;
} else {
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" ],
[ "Type of Library" => "i:status/i:libraryType" ],
- [ Country => "i:status/i:country" ],
[ "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" ],
+ [ "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" ],
[ "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.
-" } ],
+ [ "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 ],
return "$nok/$nall = " . int(100*$nok/$nall) . "%";
}
+sub calc_init_options {
+ my($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 $expr = 'e:indexInfo/e:index/e:map/e:attr[
+ my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
@set = "'.$set.'" and @type = "1"]';
- my @bib1nodes = $xc->findnodes($expr);
- my $nbib1 = @bib1nodes;
- return "[none]" if $nbib1 == 0;
+ my @nodes = $xc->findnodes($expr);
+ my $n = @nodes;
+ return "[none]" if $n == 0;
my $res = "";
my($first, $last);
- @bib1nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @bib1nodes;
- foreach my $node (@bib1nodes) {
+ @nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @nodes;
+ foreach my $node (@nodes) {
my $ap .= $node->findvalue(".");
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;
}
}
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";
}
sub calc_boolean {