X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=1e19a8b6e41672fac8b902c6a68eef6069eaf573;hp=a371c49188fc782c58c20c5e47ae9f418492e81c;hb=25e217feb6b3c709ab51acac74827443342fc823;hpb=9256e774441281d764891b4fb1184a16e887741c

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index a371c49..1e19a8b 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,10 +1,7 @@
-%# $Id: full.mc,v 1.12 2006-11-06 17:40:04 mike Exp $
+%# $Id: full.mc,v 1.19 2006-12-06 13:00:40 mike Exp $
 <%args>
 $id
 </%args>
-<%once>
-use ZOOM;
-</%once>
 <%perl>
 my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
 $conn->option(elementSetName => "zeerex");
@@ -17,24 +14,26 @@ if ($n == 0) {
     $m->comp("/details/error.mc",
 	     title => "Error", message => "No such ID '$id'");
 } else {
-    my $rec = $rs->record(0);
-    my $xc = irspy_xpath_context($rec);
+    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" ],
 		  [ "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" ],
 		  [ Description => "e:databaseInfo/e:description",
 		    lang => "en", primary => "true" ],
 		  [ Author => "e:databaseInfo/e:author" ],
 		  [ Contact => "e:databaseInfo/e:contact" ],
+		  [ "URL to Hosting Organisation" => "i:status/i:hostURL" ],
 		  [ Extent => "e:databaseInfo/e:extent" ],
 		  [ History => "e:databaseInfo/e:history" ],
 		  [ "Language of Records" => "e:databaseInfo/e:langUsage" ],
@@ -44,20 +43,16 @@ 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 ],
+		  [ "Named Result Sets" => \&calc_nrs, $xc ],
 		  [ "Record syntaxes" => \&calc_recsyn, $xc ],
 		  [ "Explain" => \&calc_explain, $xc ],
 		  );
 </%perl>
-     <h2><% xml_encode($xc->find("e:databaseInfo/e:title")) %></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) {
@@ -91,6 +86,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) = @_;
 
@@ -141,6 +151,13 @@ sub calc_boolean {
     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) = @_;