X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=6df895b141877d20e95d3ef9c2f2747091888853;hb=995c5be6913ecb0e8bf957573f6ce17b1444e1b0;hp=13865ed1c1d7f06728e85c49ffd3f01ab6654cea;hpb=415df9f44a98f5b2306df082f4982e967bcaed06;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index 13865ed..6df895b 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,4 +1,4 @@
-%# $Id: full.mc,v 1.17 2006-11-16 17:12:30 mike Exp $
+%# $Id: full.mc,v 1.20 2006-12-18 15:37:06 mike Exp $
 <%args>
 $id
 </%args>
@@ -16,19 +16,22 @@ if ($n == 0) {
 } 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" ],
@@ -43,12 +46,7 @@ if ($n == 0) {
 		  [ "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 ],
@@ -91,6 +89,21 @@ sub calc_reliability {
     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) = @_;