X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Ffull.mc;h=d5b1799a15a72ef9503f9ffc1d8d5952d8e1a8cb;hp=a316624c8da20b0368bc69da163d7c2288851c98;hb=b3608541aee80fcf7c9c230677c45d303b43c2ca;hpb=45a43605d0df16b4321ab931650d3b122bdb1916

diff --git a/web/htdocs/details/full.mc b/web/htdocs/details/full.mc
index a316624..d5b1799 100644
--- a/web/htdocs/details/full.mc
+++ b/web/htdocs/details/full.mc
@@ -1,13 +1,11 @@
-%# $Id: full.mc,v 1.18 2006-12-05 17:37:26 mike Exp $
+%# $Id: full.mc,v 1.28 2007-05-11 13:32:57 mike Exp $
 <%args>
 $id
 </%args>
 <%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) {
@@ -25,10 +23,11 @@ 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' ],
 		  [ Description => "e:databaseInfo/e:description",
 		    lang => "en", primary => "true" ],
 		  [ Author => "e:databaseInfo/e:author" ],
@@ -42,13 +41,8 @@ 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 ],
-		  [ "Services" => sub { "
-### IRSpy does not yet check for search, present, delSet,
-concurrentOperations, namedResultSets, etc. and store the information
-is a usable form.  This information should probably be harvested from
-the Init Response.
-" } ],
+		  [ "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 ],
@@ -56,8 +50,9 @@ the Init Response.
 		  [ "Record syntaxes" => \&calc_recsyn, $xc ],
 		  [ "Explain" => \&calc_explain, $xc ],
 		  );
+    my $title = $xc->find("e:databaseInfo/e:title");
 </%perl>
-     <h2><% xml_encode($xc->find("e:databaseInfo/e:title"), "") %></h2>
+     <h2><% xml_encode($title, "") %></h2>
      <table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
 <%perl>
     foreach my $ref (@fields) {
@@ -71,12 +66,25 @@ the Init Response.
 	if ($data) {
 </%perl>
       <tr>
-       <th><% xml_encode($caption) %></th>
+% $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>
       </tr>
 %	}
 %   }
      </table>
+     <p>
+      <a href="<% xml_encode("http://targettest.indexdata.com/targettest/search/index.zap?" .
+	join("&",
+	     "target=" . uri_escape_utf8(irspy_identifier2target($id)),
+	     "name=" . uri_escape_utf8($title),
+	     "attr=" . join(" ", list_ap($xc, "bib-1")),
+	     "formats=" . calc_recsyn($xc, " ")))
+	%>">Search this target.</a>
+     </p>
 % }
 <%perl>
 
@@ -91,31 +99,41 @@ sub calc_reliability {
     return "$nok/$nall = " . int(100*$nok/$nall) . "%";
 }
 
+sub calc_init_options {
+    my($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($xc, $set) = @_;
 
-    my $expr = 'e:indexInfo/e:index/e:map/e:attr[
-	@set = "'.$set.'" and @type = "1"]';
-    my @bib1nodes = $xc->findnodes($expr);
-    my $nbib1 = @bib1nodes;
-    return "[none]" if $nbib1 == 0;
+    my @aps = list_ap($xc, $set);
+    my $n = @aps;
+    return "[none]" if $n == 0;
 
     my $res = "";
     my($first, $last);
-    @bib1nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @bib1nodes;
-    foreach my $node (@bib1nodes) {
-	my $ap .= $node->findvalue(".");
+    foreach my $ap (@aps) {
 	if (!defined $first) {
-	    $first = $ap;
-	} elsif (!defined $last || $last == $ap-1) {
-	    $last = $ap;
+	    $first = $last = $ap;
+	} elsif ($ap == $last+1) {
+	    $last++;
 	} else {
 	    # Got a complete range
 	    $res .= ", " if $res ne "";
 	    $res .= "$first";
-	    $res .= "-$last" if defined $last;
-	    $first = $ap;
-	    $last = undef;
+	    $res .= "-$last" if $last > $first;
+	    $first = $last = $ap;
 	}
     }
 
@@ -123,10 +141,19 @@ sub calc_ap {
     if (defined $first) {
 	$res .= ", " if $res ne "";
 	$res .= "$first";
-	$res .= "-$last" if defined $last;
+	$res .= "-$last" if $last > $first;
     }
 
-    return "$nbib1 access points: $res";
+    return "$n access points: $res";
+}
+
+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 {
@@ -149,10 +176,11 @@ sub calc_nrs {
 }
 
 sub calc_recsyn {
-    my($xc) = @_;
+    my($xc, $sep) = @_;
+    $sep = ", " if !defined $sep;
 
     my @nodes = $xc->findnodes('e:recordInfo/e:recordSyntax');
-    my $res = join(", ", map { $_->findvalue('@name') } @nodes);
+    my $res = join($sep, map { $_->findvalue('@name') } @nodes);
     $res = "[none]" if $res eq "";
     return $res;
 }
@@ -165,5 +193,4 @@ sub calc_explain {
     $res = "[none]" if $res eq "";
     return $res;
 }
-
 </%perl>