X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=b1b5f3a66daf0eb915cc00fcb0a6171199ef8066;hp=b64da23fab9a6894c4e777aca635cee4d3ad6e1f;hb=22b72da58083aeda259ab7cb79f50f32106dc1b9;hpb=783775444a750da2255d2f5e8e699c0773e0e6fe

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index b64da23..b1b5f3a 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,4 +1,4 @@
-%# $Id: full.mc,v 1.3 2006-10-27 00:46:38 mike Exp $
+%# $Id: full.mc,v 1.8 2006-11-06 17:01:03 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" ],
@@ -42,22 +43,22 @@ if ($n == 0) {
 		  [ "Implementation ID" => "i:status/i:implementationId" ],
 		  [ "Implementation Name" => "i:status/i:implementationName" ],
 		  [ "Implementation Version" => "i:status/i:implementationVersion" ],
-		  [ "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" } ],
+		  [ "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." } ],
+		  [ "Bib-1 Use attributes" => \&calc_bib1, $xc ],
 		  [ "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);
 	}
@@ -70,14 +71,55 @@ if ($n == 0) {
 %	}
 %   }
      </table>
-     <p>
-      <a href="<% xml_encode("/check.html?id=" . uri_escape($id))
-		%>">Test this target</a>
-      <br/>
-      <a href="<% xml_encode("/edit.html?id=" . uri_escape($id))
-		%>">Edit this target's information</a>
-      <br/>
-      <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_bib1 {
+    my($xc) = @_;
+
+    my @bib1nodes = $xc->findnodes('e:indexInfo/e:index/e:map/e:attr[
+	@set = "bib-1" and @type = "1"]');
+    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";
+}
+
+</%perl>