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

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index d706a62..abf5c01 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,75 +1,204 @@
-%# $Id: full.mc,v 1.2 2006-10-26 17:23:13 mike Exp $
+%# $Id: full.mc,v 1.30 2007-07-03 13:10:50 mike Exp $
 <%args>
 $id
 </%args>
-<%once>
-use ZOOM;
-</%once>
 <%perl>
-my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1");
+my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
 $conn->option(elementSetName => "zeerex");
-my $qid = $id;
-$qid =~ s/"/\\"/g;
-my $query = qq[rec.id="$qid"];
+my $query = cql_target($id);
 my $rs = $conn->search(new ZOOM::Query::CQL($query));
 my $n = $rs->size();
 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" ],
-		  [ "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" ],
+		  [ "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" ],
+		  [ "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" ],
 		  [ 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" ],
 		  [ 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/reliability" => \&calc_reliability, $xc ],
+		  [ "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 ],
 		  );
+    my $title = $xc->find("e:databaseInfo/e:title");
 </%perl>
-     <h2><% xml_encode($id) %></h2>
+     <h2><% xml_encode($title, "") %></h2>
      <table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
 <%perl>
     foreach my $ref (@fields) {
-	my($caption, $xpath, %attrs) = @$ref;
-	my $data;
+	my($caption, $xpath, @args) = @$ref;
+	my($data, $linkURL);
 	if (ref $xpath && ref($xpath) eq "CODE") {
-	    $data = &$xpath();
+	    ($data, $linkURL) = &$xpath($id, @args);
 	} else {
 	    $data = $xc->find($xpath);
 	}
 	if ($data) {
+	    print "      <tr>\n";
+	    $caption =~ s/\/(.*)//;
+	    my $help = $1;
+	    my($linkstart, $linkend) = ("", "");
+	    if (defined $linkURL) {
+		$linkstart = '<a href="' . xml_encode($linkURL) . '">';
+		$linkend = "</a>";
+	    }
 </%perl>
-      <tr>
-       <th><% xml_encode($caption) %></th>
-       <td><% xml_encode($data) %></td>
+       <th><% xml_encode($caption) %><%
+	!defined $help ? "" : $m->comp("/help/link.mc", help =>"info/$help")
+	%></th>
+       <td><% $linkstart . xml_encode($data) . $linkend %></td>
       </tr>
 %	}
 %   }
      </table>
      <p>
-      <a href="<% xml_encode("/raw.html?id=" . uri_escape($id))
-		%>">Raw XML record</a>
+% my $target = irspy_identifier2target($id);
+% $target =~ s/^tcp://; # Apparently ZAP can't handle the leading "tcp:"
+      <a href="<% xml_encode("http://targettest.indexdata.com/targettest/search/index.zap?" .
+	join("&",
+	     "target=" . uri_escape_utf8($target),
+	     "name=" . uri_escape_utf8($title),
+	     "attr=" . join(" ", _list_ap($xc, "bib-1")),
+	     "formats=" . calc_recsyn($id, $xc, " ")))
+	%>">Search this target.</a>
      </p>
 % }
+<%perl>
+
+sub calc_reliability {
+    my($id, $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_init_options {
+    my($id, $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($id, $xc, $set) = @_;
+
+    my @aps = _list_ap($xc, $set);
+    my $n = @aps;
+    return "[none]" if $n == 0;
+
+    my $res = "";
+    my($first, $last);
+    foreach my $ap (@aps) {
+	if (!defined $first) {
+	    $first = $last = $ap;
+	} elsif ($ap == $last+1) {
+	    $last++;
+	} else {
+	    # Got a complete range
+	    $res .= ", " if $res ne "";
+	    $res .= "$first";
+	    $res .= "-$last" if $last > $first;
+	    $first = $last = $ap;
+	}
+    }
+
+    # Leftovers
+    if (defined $first) {
+	$res .= ", " if $res ne "";
+	$res .= "$first";
+	$res .= "-$last" if $last > $first;
+    }
+
+    return ("$n access points: $res",
+	    "/ap.html?id=$id&set=$set");
+}
+
+sub _list_ap {
+    my($xc, $set) = @_;
+
+    my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
+	@set = "'.$set.'" and @type = "1"]';
+    my @nodes = $xc->findnodes($expr);
+    return sort { $a <=> $b } map { $_->findvalue(".") } @nodes;
+}
+
+sub calc_boolean {
+    my($id, $xc) = @_;
+
+    ### Note that we are currently interrogating an IRSpy extension.
+    #	The standard ZeeRex record should be extended with a
+    #	"supports" type for this.
+    my @nodes = $xc->findnodes('i:status/i:boolean[@ok = "1"]');
+    my $res = join(", ", map { $_->findvalue('@operator') } @nodes);
+    $res = "[none]" if $res eq "";
+    return $res;
+}
+
+sub calc_nrs {
+    my($id, $xc) = @_;
+
+    my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
+    return @nodes ? "Yes" : "No";
+}
+
+sub calc_recsyn {
+    my($id, $xc, $sep) = @_;
+    $sep = ", " if !defined $sep;
+
+    my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
+    my $res = join($sep, map { $_->findvalue('@name') } @nodes);
+    $res = "[none]" if $res eq "";
+    return $res;
+}
+
+sub calc_explain {
+    my($id, $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>