X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=546419b54fce24b93aa2405049ba0e8a2eb741ad;hb=1eaed6aa4a401a236ad0b3f3c0c39cebee6090d8;hp=ada79e23abc5e8d22674a45d8b1e3f551cbce6fe;hpb=7e30dd5f86e43b3e2f19b33d713d413168c7fd6b;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index ada79e2..546419b 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,13 +1,11 @@
-%# $Id: full.mc,v 1.27 2007-04-27 14:04:40 mike Exp $
 <%args>
 $id
 </%args>
 <%perl>
-my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1");
+my $db = ZOOM::IRSpy::connect_to_registry();
+my $conn = new ZOOM::Connection($db);
 $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) {
@@ -43,14 +41,16 @@ if ($n == 0) {
 		  [ "Implementation ID" => "i:status/i:implementationId" ],
 		  [ "Implementation Name" => "i:status/i:implementationName" ],
 		  [ "Implementation Version" => "i:status/i:implementationVersion" ],
-		  [ "Reliability/reliability" => \&calc_reliability, $xc ],
+		  [ "Reliability/reliability" => \&calc_reliability_wrapper, $xc ],
 		  [ "Services" => \&calc_init_options, $xc ],
 		  [ "Bib-1 Use attributes" => \&calc_ap, $xc, "bib-1" ],
 		  [ "Dan-1 Use attributes" => \&calc_ap, $xc, "dan-1" ],
+		  [ "Bath Profile searches" => \&calc_bath, $xc ],
 		  [ "Operators" => \&calc_boolean, $xc ],
 		  [ "Named Result Sets" => \&calc_nrs, $xc ],
 		  [ "Record syntaxes" => \&calc_recsyn, $xc ],
 		  [ "Explain" => \&calc_explain, $xc ],
+		  [ "Multiple OPAC records" => \&calc_mor, $xc ],
 		  );
     my $title = $xc->find("e:databaseInfo/e:title");
 </%perl>
@@ -59,50 +59,51 @@ if ($n == 0) {
 <%perl>
     foreach my $ref (@fields) {
 	my($caption, $xpath, @args) = @$ref;
-	my $data;
+	my($data, $linkURL);
 	if (ref $xpath && ref($xpath) eq "CODE") {
-	    $data = &$xpath(@args);
+	    ($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>
-% $caption =~ s/\/(.*)//;
-% my $help = $1;
        <th><% xml_encode($caption) %><%
 	!defined $help ? "" : $m->comp("/help/link.mc", help =>"info/$help")
 	%></th>
-       <td><% xml_encode($data) %></td>
+       <td><% $linkstart . xml_encode($data) . $linkend %></td>
       </tr>
 %	}
 %   }
      </table>
      <p>
+% 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(irspy_identifier2target($id)),
+	     "target=" . uri_escape_utf8($target),
 	     "name=" . uri_escape_utf8($title),
-	     "attr=" . join(" ", list_ap($xc, "bib-1")),
-	     "formats=" . calc_recsyn($xc, " ")))
+	     "attr=" . join(" ", _list_ap($xc, "bib-1")),
+	     "formats=" . calc_recsyn($id, $xc, " ")))
 	%>">Search this target.</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_reliability_wrapper {
+    my($id, $xc) = @_;
+    return calc_reliability_string($xc);
 }
 
 sub calc_init_options {
-    my($xc) = @_;
+    my($id, $xc) = @_;
 
     my @ops;
     my @nodes = $xc->findnodes('e:configInfo/e:supports/@type');
@@ -117,9 +118,9 @@ sub calc_init_options {
 }
 
 sub calc_ap {
-    my($xc, $set) = @_;
+    my($id, $xc, $set) = @_;
 
-    my @aps = list_ap($xc, $set);
+    my @aps = _list_ap($xc, $set);
     my $n = @aps;
     return "[none]" if $n == 0;
 
@@ -146,10 +147,11 @@ sub calc_ap {
 	$res .= "-$last" if $last > $first;
     }
 
-    return "$n access points: $res";
+    return ("$n access points: $res",
+	    "/ap.html?id=$id&set=$set");
 }
 
-sub list_ap {
+sub _list_ap {
     my($xc, $set) = @_;
 
     my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
@@ -158,8 +160,17 @@ sub list_ap {
     return sort { $a <=> $b } map { $_->findvalue(".") } @nodes;
 }
 
+sub calc_bath {
+    my($id, $xc) = @_;
+
+    my @nodes = $xc->findnodes('i:status/i:search_bath[@ok = "1"]');
+    my $res = join(", ", map { $_->findvalue('@name') } @nodes);
+    $res = "[none]" if $res eq "";
+    return $res;
+}
+
 sub calc_boolean {
-    my($xc) = @_;
+    my($id, $xc) = @_;
 
     ### Note that we are currently interrogating an IRSpy extension.
     #	The standard ZeeRex record should be extended with a
@@ -170,15 +181,18 @@ sub calc_boolean {
     return $res;
 }
 
-sub calc_nrs {
-    my($xc) = @_;
+sub calc_nrs { _calc_boolean(@_, 'i:status/i:named_resultset[@ok = "1"]') }
+sub calc_mor { _calc_boolean(@_, 'i:status/i:multiple_opac[@ok = "1"]') }
+
+sub _calc_boolean {
+    my($id, $xc, $xpath) = @_;
 
-    my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
+    my @nodes = $xc->findnodes($xpath);
     return @nodes ? "Yes" : "No";
 }
 
 sub calc_recsyn {
-    my($xc, $sep) = @_;
+    my($id, $xc, $sep) = @_;
     $sep = ", " if !defined $sep;
 
     my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
@@ -188,7 +202,7 @@ sub calc_recsyn {
 }
 
 sub calc_explain {
-    my($xc) = @_;
+    my($id, $xc) = @_;
 
     my @nodes = $xc->findnodes('i:status/i:explain[@ok = "1"]');
     my $res = join(", ", map { $_->findvalue('@category') } @nodes);