projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show "[UNTITLED]" for records with no title: this is important, since
[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
1e19a8b
..
dd48c28
100644
(file)
--- a/
web/htdocs/details/full.mc
+++ b/
web/htdocs/details/full.mc
@@
-1,9
+1,9
@@
-%# $Id: full.mc,v 1.19 2006-12-06 13:00:40 mike Exp $
+%# $Id: full.mc,v 1.22 2007-02-02 11:31:30 mike Exp $
<%args>
$id
</%args>
<%perl>
<%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;
$conn->option(elementSetName => "zeerex");
my $qid = $id;
$qid =~ s/"/\\"/g;
@@
-29,6
+29,9
@@
if ($n == 0) {
"e:serverInfo/e:authentication/e:user" ],
[ "Password (if needed)" =>
"e:serverInfo/e:authentication/e:password" ],
"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" ],
[ Description => "e:databaseInfo/e:description",
lang => "en", primary => "true" ],
[ Author => "e:databaseInfo/e:author" ],
@@
-104,28
+107,27
@@
sub calc_init_options {
sub calc_ap {
my($xc, $set) = @_;
sub calc_ap {
my($xc, $set) = @_;
- my $expr = 'e:indexInfo/e:index/e:map/e:attr[
+ my $expr = 'e:indexInfo/e:index[@search = "true"]/e:map/e:attr[
@set = "'.$set.'" and @type = "1"]';
@set = "'.$set.'" and @type = "1"]';
- my @bib1nodes = $xc->findnodes($expr);
- my $nbib1 = @bib1nodes;
- return "[none]" if $nbib1 == 0;
+ my @nodes = $xc->findnodes($expr);
+ my $n = @nodes;
+ return "[none]" if $n == 0;
my $res = "";
my($first, $last);
my $res = "";
my($first, $last);
- @bib1nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @bib1nodes;
- foreach my $node (@bib1nodes) {
+ @nodes = sort { $a->findvalue(".") <=> $b->findvalue(".") } @nodes;
+ foreach my $node (@nodes) {
my $ap .= $node->findvalue(".");
if (!defined $first) {
my $ap .= $node->findvalue(".");
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";
} 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;
}
}
}
}
@@
-133,10
+135,10
@@
sub calc_ap {
if (defined $first) {
$res .= ", " if $res ne "";
$res .= "$first";
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 calc_boolean {
}
sub calc_boolean {