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

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index d706a62..843841f 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.7 2006-11-06 16:22:17 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,25 @@ 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 { "### 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" } ],
 		  );
 </%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 +71,16 @@ 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 @allpings == 0;
+    my @okpings = $xc->findnodes('i:status/i:probe[@ok = "1"]');
+    my $nok = @okpings;
+    return "$nok/$nall = " . int(100*$nok/$nall) . "%";
+}
+</%perl>