X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=5f7ac19157d2e14e929f40b04a1d44a5c64ea3e5;hp=d706a6272136b6ddf52ed853d3018804e1d36899;hb=5af2144c9a1726a64ee62805bea33a8094109ceb;hpb=085f4a7c5d42a0f3720e0684cda4f8c737143da9

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index d706a62..5f7ac19 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,4 +1,4 @@
-%# $Id: full.mc,v 1.2 2006-10-26 17:23:13 mike Exp $
+%# $Id: full.mc,v 1.13 2006-11-06 17:43:29 mike Exp $
 <%args>
 $id
 </%args>
@@ -20,6 +20,7 @@ if ($n == 0) {
     my $rec = $rs->record(0);
     my $xc = irspy_xpath_context($rec);
     my @fields = (
+		  [ "Last Checked" => "i:status/i:probe[last()]" ],
 		  [ Protocol => "e:serverInfo/\@protocol" ],
 		  [ Host => "e:serverInfo/e:host" ],
 		  [ Port => "e:serverInfo/e:port" ],
@@ -39,23 +40,32 @@ if ($n == 0) {
 		  [ "Language of Records" => "e:databaseInfo/e:langUsage" ],
 		  [ Restrictions => "e:databaseInfo/e:restrictions" ],
 		  [ Subjects => "e:databaseInfo/e:subjects" ],
-		  [ "Server ID" => sub { "CNIDR zserver v2.07g" } ],
-		  [ "Reliability" => sub { "97%" } ],
-		  [ "Services" => sub { "search, present, delSet, concurrentOperations, namedResultSets" } ],
-		  [ "Bib-1 Use attributes" => sub { "4-5, 7-8, 12, 21, 31, 54, 58, 63, 1003-1005, 1009, 1011-1012, 1016, 1031" } ],
-		  [ "Operators" => sub { "and, or, not" } ],
-		  [ "Record syntaxes" => sub { "SUTRS, USmarc, Danmarc" } ],
-		  [ "Explain" => sub { "CategoryList, TargetInfo, DatabaseInfo, RecordSyntaxInfo, AttributeSetInfo, AttributeDetails" } ],
+		  [ "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.
+" } ],
+		  [ "Bib-1 Use attributes" => \&calc_ap, $xc, "bib-1" ],
+		  [ "Dan-1 Use attributes" => \&calc_ap, $xc, "dan-1" ],
+		  [ "Operators" => \&calc_boolean, $xc ],
+		  [ "Named Result Sets" => \&calc_nrs, $xc ],
+		  [ "Record syntaxes" => \&calc_recsyn, $xc ],
+		  [ "Explain" => \&calc_explain, $xc ],
 		  );
 </%perl>
-     <h2><% xml_encode($id) %></h2>
+     <h2><% xml_encode($xc->find("e:databaseInfo/e:title")) %></h2>
      <table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
 <%perl>
     foreach my $ref (@fields) {
-	my($caption, $xpath, %attrs) = @$ref;
+	my($caption, $xpath, @args) = @$ref;
 	my $data;
 	if (ref $xpath && ref($xpath) eq "CODE") {
-	    $data = &$xpath();
+	    $data = &$xpath(@args);
 	} else {
 	    $data = $xc->find($xpath);
 	}
@@ -68,8 +78,93 @@ if ($n == 0) {
 %	}
 %   }
      </table>
-     <p>
-      <a href="<% xml_encode("/raw.html?id=" . uri_escape($id))
-		%>">Raw XML record</a>
-     </p>
 % }
+<%perl>
+
+sub calc_reliability {
+    my($xc) = @_;
+
+    my @allpings = $xc->findnodes("i:status/i:probe");
+    my $nall = @allpings;
+    return "[untested]" if $nall == 0;
+    my @okpings = $xc->findnodes('i:status/i:probe[@ok = "1"]');
+    my $nok = @okpings;
+    return "$nok/$nall = " . int(100*$nok/$nall) . "%";
+}
+
+sub calc_ap {
+    my($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 $res = "";
+    my($first, $last);
+    @bib1nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @bib1nodes;
+    foreach my $node (@bib1nodes) {
+	my $ap .= $node->findvalue(".");
+	if (!defined $first) {
+	    $first = $ap;
+	} elsif (!defined $last || $last == $ap-1) {
+	    $last = $ap;
+	} else {
+	    # Got a complete range
+	    $res .= ", " if $res ne "";
+	    $res .= "$first";
+	    $res .= "-$last" if defined $last;
+	    $first = $ap;
+	    $last = undef;
+	}
+    }
+
+    # Leftovers
+    if (defined $first) {
+	$res .= ", " if $res ne "";
+	$res .= "$first";
+	$res .= "-$last" if defined $last;
+    }
+
+    return "$nbib1 access points: $res";
+}
+
+sub calc_boolean {
+    my($xc) = @_;
+
+    ### Note that we are currently interrogating an IRSpy extension.
+    #	The standard ZeeRex record should be extended with a
+    #	"supports" type for this.
+    my @nodes = $xc->findnodes('i:status/i:boolean[@ok = "1"]');
+    my $res = join(", ", map { $_->findvalue('@operator') } @nodes);
+    $res = "[none]" if $res eq "";
+    return $res;
+}
+
+sub calc_nrs {
+    my($xc) = @_;
+
+    my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
+    return @nodes ? "Yes" : "No";
+}
+
+sub calc_recsyn {
+    my($xc) = @_;
+
+    my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
+    my $res = join(", ", map { $_->findvalue('@name') } @nodes);
+    $res = "[none]" if $res eq "";
+    return $res;
+}
+
+sub calc_explain {
+    my($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;
+}
+
+</%perl>