DOn't use ZOOM -- layout.mc does that.

[irspy-moved-to-github.git] / web / htdocs / details / full.mc

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index a152a74..36b7232 100644 (file)
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,10 +1,7 @@
-%# $Id: full.mc,v 1.11 2006-11-06 17:34:58 mike Exp $
+%# $Id: full.mc,v 1.16 2006-11-16 11:48:49 mike Exp $
 <%args>
 $id
 </%args>
-<%once>
-use ZOOM;
-</%once>
 <%perl>
 my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
 $conn->option(elementSetName => "zeerex");
@@ -25,6 +22,8 @@ if ($n == 0) {
                  [ 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)" =>
@@ -35,6 +34,7 @@ if ($n == 0) {
                    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,15 +44,21 @@ 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." } ],
+                 [ "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" => sub { "### CategoryList, TargetInfo, DatabaseInfo, RecordSyntaxInfo, AttributeSetInfo, AttributeDetails" } ],
+                 [ "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) {
@@ -131,14 +137,34 @@ sub calc_boolean {
     #  The standard ZeeRex record should be extended with a
     #  "supports" type for this.
     my @nodes = $xc->findnodes('i:status/i:boolean[@ok = "1"]');
-    return join(", ", map { $_->findvalue('@operator') } @nodes);
+    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');
-    return join(", ", map { $_->findvalue('@name') } @nodes);
+    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>