Remove leading "tcp:" from target string given to ZAP.

[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 8819d45..abf5c01 100644 (file)
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,13 +1,11 @@
-%# $Id: full.mc,v 1.24 2007-04-16 12:23:46 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");
 $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) {
@@ -25,10 +23,8 @@ if ($n == 0) {
                  [ 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" ],
+#                [ "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' ],
@@ -45,7 +41,7 @@ if ($n == 0) {
                  [ "Implementation ID" => "i:status/i:implementationId" ],
                  [ "Implementation Name" => "i:status/i:implementationName" ],
                  [ "Implementation Version" => "i:status/i:implementationVersion" ],
-                 [ "Reliability" => \&calc_reliability, $xc ],
+                 [ "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" ],
@@ -61,35 +57,46 @@ 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>
-       <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>
+% 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($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($id, $xc) = @_;
 
     my @allpings = $xc->findnodes("i:status/i:probe");
     my $nall = @allpings;
@@ -100,7 +107,7 @@ sub calc_reliability {
 }
 
 sub calc_init_options {
-    my($xc) = @_;
+    my($id, $xc) = @_;
 
     my @ops;
     my @nodes = $xc->findnodes('e:configInfo/e:supports/@type');
@@ -115,9 +122,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 +151,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 +165,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 +177,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 +194,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);