X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=0ff52e617ee0ee0817fcf897fd96e6fb892e11f0;hb=6139331b9c46136cbd8c501ee497ad381ec489e6;hp=5a948eb95bed712bc07b23f8c6c036ae3a23b820;hpb=ff3589bc175b51e067d7b32de9009d2efa7b0e96;p=irspy-moved-to-github.git

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index 5a948eb..0ff52e6 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,9 +1,9 @@
-%# $Id: full.mc,v 1.29 2007-06-28 12:00:31 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 +41,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" ],
@@ -49,6 +49,7 @@ if ($n == 0) {
 		  [ "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>
@@ -82,9 +83,11 @@ if ($n == 0) {
 %   }
      </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($id, $xc, " ")))
@@ -93,15 +96,9 @@ if ($n == 0) {
 % }
 <%perl>
 
-sub calc_reliability {
+sub calc_reliability_wrapper {
     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) . "%";
+    return calc_reliability_string($xc);
 }
 
 sub calc_init_options {
@@ -174,10 +171,13 @@ sub calc_boolean {
     return $res;
 }
 
-sub calc_nrs {
-    my($id, $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";
 }