X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=baec2605480dd143c5027c5fee75f8bcfc706c28;hp=d5b1799a15a72ef9503f9ffc1d8d5952d8e1a8cb;hb=0ab30e7e20933507512444aed53bcb4ba84003b1;hpb=7e87ee15785ae0693ec585186dce9e0a405f69d7

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index d5b1799..baec260 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,9 +1,10 @@
-%# $Id: full.mc,v 1.28 2007-05-11 13:32:57 mike Exp $
+%# $Id: full.mc,v 1.30 2007-07-03 13:10:50 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 $query = cql_target($id);
 my $rs = $conn->search(new ZOOM::Query::CQL($query));
@@ -41,7 +42,7 @@ 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" ],
@@ -57,50 +58,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');
@@ -115,9 +117,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;
 
@@ -144,10 +146,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[
@@ -157,7 +160,7 @@ sub list_ap {
 }
 
 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
@@ -169,14 +172,14 @@ sub calc_boolean {
 }
 
 sub calc_nrs {
-    my($xc) = @_;
+    my($id, $xc) = @_;
 
     my @nodes = $xc->findnodes('i:status/i:named_resultset[@ok = "1"]');
     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');
@@ -186,7 +189,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);