#
-# $Id: z39util.tcl,v 1.35 1996/03/05 18:50:26 adam Exp $
+# $Id: z39util.tcl,v 1.39 1996/03/12 16:30:30 adam Exp $
#
proc saveState {} {
uplevel #0 {
set sessionWait -1
}
-proc display-brief {zset no tno} {
+proc display-medium {zset no setNo targetNo} {
global env
- global setNo
global sessionId
html {<li>}
return
}
set rtype [$zset recordType $no]
- if {$rtype == "SUTRS"} {
- html [join [$zset getSutrs $no]]
- html "<br>\n"
- return
+ switch $rtype {
+ SUTRS {
+ html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+ html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+ html [join [$zset getSutrs $no]]
+ html "</a><br>\n"
+ return
+ }
+ WAIS {
+ html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+ html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+ html [join [$zset getWAIS $no headline]]
+ html {</a>}
+ html "<br>\n"
+ html {Score: } [$zset getWAIS $no score]
+ set lines [$zset getWAIS $no lines]
+ if {$lines > 0} {
+ html {, } $lines { lines}
+ }
+ html "<br>\n"
+ return
+ }
}
- if {$rtype == "WAIS"} {
+ if {![catch {
+ set author [$zset getMarc $no field 100 * a]
+ set corp [$zset getMarc $no field 110 * a]
+ set meet [$zset getMarc $no field 111 * a]
+ set title [$zset getMarc $no field 245 * a]
+ if {[llength $author] == 0} {
+ set cover [$zset getMarc $no field 245 * {[bc]}]
+ } else {
+ set cover [$zset getMarc $no field 245 * b]
+ }
+ set location [$zset getMarc $no field 260 * a]
+ set publisher [$zset getMarc $no field 260 * b]
+ set year [$zset getMarc $no field 260 * c]
+ } dispError ] } {
html { <a href="http:} $env(SCRIPT_NAME) /
- html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
- html [join [$zset getWAIS $no headline]]
- html {</a>}
- html "<br>\n"
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+ set p 0
+ foreach a $author {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ foreach a $corp {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ foreach a $meet {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ if {$p} {
+ html ": "
+ }
+ set nope 1
+ foreach v $title {
+ html $v
+ set nope 0
+ }
+ set v [join $cover ""]
+ if {[string length $v] > 0} {
+ set nope 0
+ html $v
+ } elseif {$nope} {
+ html "No Title"
+ }
+ html {</a> }
+ } else {
+ html { <a href="http:} $env(SCRIPT_NAME) /
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+ html {No Title}
+ html {</a> }
+ html "Error: " $dispError "\n"
+ }
+ html "<br>\n"
+}
+
+proc display-brief {zset no setNo targetNo} {
+ global env
+ global sessionId
+
+ html {<li>}
+ set type [$zset type $no]
+ if {$type == "SD"} {
+ set err [lindex [$zset diag $no] 1]
+ set add [lindex [$zset diag $no] 2]
+ if {$add != {}} {
+ set add " :${add}"
+ }
+ html "${no} Error ${err}${add} <br>\n"
return
}
+ if {$type != "DB"} {
+ return
+ }
+ set rtype [$zset recordType $no]
+ switch $rtype {
+ SUTRS {
+ html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+ html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+ html [string range [join [$zset getSutrs $no]] 0 70]
+ html "</a><br>\n"
+ return
+ }
+ WAIS {
+ html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+ html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+ html [string range [join [$zset getWAIS $no headline]] 0 70]
+
+ html {</a>}
+ set score [$zset getWAIS $no score]
+ html { Score } $score
+ html "<br>\n"
+ return
+ }
+ }
if {![catch {
set author [$zset getMarc $no field 100 * a]
set corp [$zset getMarc $no field 110 * a]
set year [$zset getMarc $no field 260 * c]
} dispError ] } {
html { <a href="http:} $env(SCRIPT_NAME) /
- html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
set p 0
foreach a $author {
if {$p} {
if {$p} {
html ": "
}
+ html {<it>}
set nope 1
foreach v $title {
html $v
set nope 0
}
+ html {</it>}
if {$nope} {
set v [join $cover ""]
if {[string length $v] > 40} {
html {</a> }
} else {
html { <a href="http:} $env(SCRIPT_NAME) /
- html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
html {No Title}
html {</a> }
html "Error: " $dispError "\n"
html "<br>\n"
}
-proc display-raw {zset no tno} {
+proc display-raw {zset no setNo targetNo} {
set type [$zset type $no]
- if {$type == "SD"} {
- set err [lindex [$zset diag $no] 1]
- set add [lindex [$zset diag $no] 2]
- if {$add != {}} {
- set add " :${add}"
+ switch $type {
+ SD {
+ set err [lindex [$zset diag $no] 1]
+ set add [lindex [$zset diag $no] 2]
+ if {$add != {}} {
+ set add " :${add}"
+ }
+ html "<h3>${no}</h3>\n"
+ html "Error ${err}${add} <br>\n"
+ return
+ }
+ DB {
+ }
+ default {
+ return
}
- html "<h3>${no}</h3>\n"
- html "Error ${err}${add} <br>\n"
- return
- }
- if {$type != "DB"} {
- return
}
set rtype [$zset recordType $no]
- if {$rtype == "SUTRS"} {
- html [join [$zset getSutrs $no]] "<br>\n"
- return
- }
+ switch $rtype {
+ SUTRS {
+ html "<xmp>\n" [join [$zset getSutrs $no]] "\n</xmp>\n"
+ return
+ }
+ WAIS {
+ html "<xmp>\n" [join [$zset getWAIS $no text]] "\n</xmp>\n"
+ return
+ }
+ }
if {[catch {set r [$zset getMarc $no line * * *]}]} {
html "Unknown record type: $rtype <br>\n"
return
}
}
-proc display-full-wais {zset no} {
- set i 0
- set element junk
- htmlToken l [join [$zset getWAIS $no text]] {
- if {[string compare [string index $l 0] {<}]} {
- set data($element) $l
- continue
- }
- switch -exact $l {
- <ti> {
- set element title
- }
- <dm> {
- set element dateOfLastModification
- }
- <ci> {
- set element controlIdentifier
- }
- <lc> {
- set element lastChecked
- }
- <by> {
- set element bytes
- }
- <avli> {
- set element linkage
- }
- <cr> {
- incr i
- }
- <li> {
- set element "$i,linkage"
- }
- <cp> {
- set element "$i,title"
- }
- default {
- set element junk
- }
- }
- }
- html {Title: } {<a href="} $data(linkage) {">} $data(title) "</a><br>\n"
- html {URL: } $data(linkage) "<br>\n"
- html {Score: } [$zset getWAIS $no score] "<br>\n"
- html {Lines: } [$zset getWAIS $no lines] "<br>\n"
- if {[info exists data(bytes)]} {
- html {Bytes: } $data(bytes) "<br>\n"
- }
- if {[info exists data(dateOfLastModification)]} {
- html {Last modified: } $data(dateOfLastModification) "<br>\n"
- }
- if {[info exists data(lastChecked)]} {
- html {Last checked: } $data(lastChecked) "<br>\n"
- }
- html "<ul>\n"
- for {set i 1} {[info exists data($i,linkage)]} {incr i} {
- html {<li><a href="} $data($i,linkage) {">}
- html $data($i,title) "</a><br>\n"
- html "URL: " $data($i,linkage)
- }
- html "</ul>\n"
-}
+proc display-full-marc {zset no setNo targetNo} {
+ global env
+ global hist
+ global sessionId
-proc display-full {zset no tno} {
- set type [$zset type $no]
- if {$type == "SD"} {
- set err [lindex [$zset diag $no] 1]
- set add [lindex [$zset diag $no] 2]
- if {$add != {}} {
- set add " :${add}"
- }
- html "Error ${err}${add} <br>\n"
- return
- }
- if {$type != "DB"} {
- return
- }
- set rtype [$zset recordType $no]
- if {$rtype == "SUTRS"} {
- html [join [$zset getSutrs $no]] "<br>\n"
- return
- }
- if {$rtype == "WAIS"} {
- display-full-wais $zset $no
- return
- }
- if {[catch {set r [$zset getMarc $no line * * *]}]} {
- html "Unknown record type: $rtype <br>\n"
- return
- }
html "<dl>\n"
set n [dl-marc-field $zset $no 700 a "Author" "Authors" "<br>\n"]
if {$n == 0} {
html "</dl>\n"
}
+proc display-full-wais {zset no setNo targetNo} {
+ global env
+ global hist
+ global sessionId
-proc display-rec {from to dfunc tno} {
- global setNo
-
- if {$tno > 0} {
- while {$from <= $to} {
- eval "$dfunc z39${tno}.${setNo} $from $tno"
- incr from
+ set i 0
+ set element junk
+ htmlToken l [join [$zset getWAIS $no text]] {
+ if {[string compare [string index $l 0] {<}]} {
+ if {[info exist data($element)]} {
+ set data($element) $data($element)$l
+ } else {
+ set data($element) $l
+ }
+ continue
+ }
+ switch -- $l {
+ <ti> {
+ set element title
+ }
+ <dm> {
+ set element dateOfLastModification
+ }
+ <ci> {
+ set element controlIdentifier
+ }
+ <lc> {
+ set element lastChecked
+ }
+ <by> {
+ set element bytes
+ }
+ <avli> {
+ set element linkage
+ }
+ <cr> {
+ incr i
+ }
+ <li> {
+ set element "$i,linkage"
+ }
+ <cp> {
+ set element "$i,title"
+ }
+ <ip> {
+ set element ip
+ }
+ default {
+ set element junk
+ }
}
+ }
+ if {![info exists data(title)] || ![info exists data(linkage)]} {
+ set nwi 0
+ } else {
+ set nwi 1
+ }
+ html "<dl>\n"
+ html {<dt><b>Title</b>}
+ if {$nwi} {
+ html {<dd><a href="} $data(linkage) {">} $data(title) "</a>"
+ html {<dt><b>URL</b>}
+ html {<dd>} $data(linkage) "<br>\n"
} else {
- while {$from <= $to} {
- eval "$dfunc z39.${setNo} $from 0"
- incr from
+ html {<dd>} [join [$zset getWAIS $no headline]]
+ }
+ html {<dt><b>Score</b><dd>} [$zset getWAIS $no score]
+ set lines [$zset getWAIS $no lines]
+ if {$lines > 0} {
+ html {<dt><b>Lines</b><dd>} $lines "<br>\n"
+ }
+ if {!$nwi} {
+ html "</dl><pre>\n" [join [$zset getWAIS $no text]] "\n</pre>\n"
+ return
+ }
+ if {[info exists data(bytes)]} {
+ html {<dt><b>Bytes</b><dd>} $data(bytes)
+ }
+ if {[info exists data(dateOfLastModification)]} {
+ html {<dt><b>Last modified</b><dd>} $data(dateOfLastModification)
+ }
+ if {[info exists data(lastChecked)]} {
+ html {<dt><b>Last checked</b><dd>} $data(lastChecked) "<br>\n"
+ }
+ if {[info exists data(ip)]} {
+ html {<dt><b>Initial text</b><dd>} $data(ip) "</dl><br>\n"
+ }
+ if {0} {
+ html {<a href="} $env(SCRIPT_NAME) / $sessionId {/sameas.egw/}
+ html $setNo + $targetNo + 1 + $hist($setNo,maxPresent) +
+ html [egw_enc [$zset getWAIS $no documentID]] {">}
+ html {Similar WAIS record</a><br>}
+ }
+ html "<dt><b>References</b>\n"
+ for {set i 1} {[info exists data($i,linkage)]} {incr i} {
+ html {<dd><a href="} $data($i,linkage) {">}
+ if {[info exists data($i,title)]} {
+ html $data($i,title)
+ } else {
+ html Untitled
}
+ html "</a><br>\n"
+ }
+ html "</dl>\n"
+}
+
+proc display-full {zset no setNo targetNo} {
+ set type [$zset type $no]
+ switch $type {
+ SD {
+ set err [lindex [$zset diag $no] 1]
+ set add [lindex [$zset diag $no] 2]
+ if {$add != {}} {
+ set add " :${add}"
+ }
+ html "Error ${err}${add} <br>\n"
+ return
+ }
+ DB {
+ }
+ default {
+ return
+ }
+ }
+ set rtype [$zset recordType $no]
+ switch $rtype {
+ SUTRS {
+ html "<pre>" [join [$zset getSutrs $no]] "</pre><br>\n"
+ return
+ }
+ WAIS {
+ display-full-wais $zset $no $setNo $targetNo
+ return
+ }
+ }
+ if {[catch {set r [$zset getMarc $no line * * *]}]} {
+ html "Unknown record type: $rtype <br>\n"
+ return
+ }
+ display-full-marc $zset $no $setNo $targetNo
+}
+
+
+proc display-rec {from to dfunc setNo targetNo} {
+ while {$from <= $to} {
+ eval "$dfunc z39${targetNo}.${setNo} $from $setNo $targetNo"
+ incr from
}
}
set q {}
for {set i 1} {$i <= $ilines} {incr i} {
set term [join [egw_form entry$i]]
- if {[lindex $targets($t) 6] == "1"} {
- if {[string length $op] == 0} {
+ if {[string length $term] == 0} continue
+ if {![string compare [lindex $targets($t) 1] WAIS]} {
+ if {[string length $q] == 0} {
set q $term
} else {
set q "$term $q"
}
set op [egw_form logic$i]
continue
- }
- if {[string length $term] > 0} {
+ } else {
set field [join [egw_form menu$i]]
+ catch {unset attr}
foreach x [lindex $targets($t) 2] {
- if {[lindex $x 0] == $field} {
+ if {![string compare [lindex $x 0] $field]} {
set attr [lindex $x 1]
}
}
+ if {![info exists attr]} {
+ egw_log debug "attr failed for $t"
+ set attr [lindex [lindex [lindex $targets($t) 2] 0] 1]
+ }
switch $op {
- And
+ And
{ set q "@and $q ${attr} \"${term}\"" }
- Or
+ Or
{ set q "@or $q ${attr} \"${term}\"" }
- {And not}
+ {And not}
{ set q "@not $q ${attr} \"${term}\"" }
- {}
+ {}
{ set q "${attr} \"${term}\"" }
}
set op [egw_form logic$i]
global sessionWait
global targets
- if {$tno > 0} {
- set zz z39$tno
- set host $hist($setNo,$tno,host)
- set idAuth $hist($setNo,$tno,idAuthentication)
- set database $hist($setNo,$tno,database)
- set scanAttr $hist($setNo,$tno,scanAttr)
- set scanTerm $hist($setNo,$tno,$scanNo,scanTerm)
- } else {
- set zz z39
- set host $hist($setNo,host)
- set idAuth $hist($setNo,idAuthentication)
- set database $hist($setNo,database)
- set scanAttr $hist($setNo,scanAttr)
- set scanTerm $hist($setNo,$scanNo,scanTerm)
- }
+ set zz z39$tno
+ set host $hist($setNo,$tno,host)
+ set idAuth $hist($setNo,$tno,idAuthentication)
+ set database $hist($setNo,$tno,database)
+ set scanAttr $hist($setNo,scanAttr)
+ set scanTerm $hist($setNo,$scanNo,scanTerm)
+
mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
global targets
global env
global sessionId
+ global scriptQuery
- if {$tno > 0} {
- set zz z39$tno
- } else {
- set zz z39
- }
+ set zz z39$tno
set zs $zz.s$scanNo.$setNo
set m [$zs numberOfEntriesReturned]
if {0} {
regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
html {<a href="http:} $env(SCRIPT_NAME)
- html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo +
+ html / $sessionId / $scriptQuery / $setNo + $hist($setNo,host) +
html $hist($setNo,scan) + $tterm {">}
} else {
regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
html {<a href="http:} $env(SCRIPT_NAME)
- html / $sessionId {/search.egw/} $setNo +
+ html / $sessionId {/search.egw/} $setNo + $tno +
html hyper + $tterm {">}
}
html [lindex [$zs scanLine $i] 1]
global sessionWait
global targets
- if {$tno > 0} {
- set zz z39$tno
- set host $hist($setNo,$tno,host)
- set idAuth $hist($setNo,$tno,idAuthentication)
- set database $hist($setNo,$tno,database)
- set query $hist($setNo,$tno,query)
- } else {
- set zz z39
- set host $hist($setNo,host)
- set idAuth $hist($setNo,idAuthentication)
- set database $hist($setNo,database)
- set query $hist($setNo,query)
- }
+ set zz z39$tno
+ set host $hist($setNo,$tno,host)
+ set idAuth $hist($setNo,$tno,idAuthentication)
+ set database $hist($setNo,$tno,database)
+ set query $hist($setNo,$tno,query)
+ catch {set docId $hist($setNo,$tno,queryId)}
+
mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
}
}
- if {[lindex $targets($host) 6] == "1"} {
+ if {![string compare [lindex $targets($host) 1] WAIS]} {
wais-set $zz.$setNo $zz
} else {
ir-set $zz.$setNo $zz
+ $zz.$setNo preferredRecordSyntax [lindex $targets($host) 1]
+ egw_log debug "set syntax to [lindex $targets($host) 1]"
}
if {![lindex $targets($host) 5]} {
set elements {}
egw_log debug "database=$database"
eval $zz.$setNo databaseNames $database
- $zz.$setNo preferredRecordSyntax USMARC
-
$zz callback [list search-response $zz.$setNo]
if {$piggy} {
$zz.$setNo largeSetLowerBound 999999
}
set sessionWait 0
egw_log debug "search: $query"
- if {[catch {$zz.$setNo search $query}]} {
- displayError "Search fail" "Connection closed"
- html "</body></html>\n"
- $zz disconnect
- return 0
+
+ if {[info exists docId]} {
+ $zz.$setNo search $query $docId
+ } else {
+ $zz.$setNo search $query
}
- if {[catch {egw_wait sessionWait 60}]} {
+ if {!$sessionWait && [catch {egw_wait sessionWait 60}]} {
egw_log debug "timeout/cancel in search"
displayError "Timeout in search" {}
html "</body></html>\n"
}
continue
}
- if {[catch [list z39$i.$setNo preferredRecordSyntax USMARC]]} {
+ if {[catch [list z39$i.$setNo preferredRecordSyntax]]} {
if {$debug} {
html "ok<br>\n"
}
- if {[lindex $targets($host) 6] == "1"} {
+ if {![string compare [lindex $targets($host) 1] WAIS]} {
wais-set z39$i.$setNo z39$i
} else {
ir-set z39$i.$setNo z39$i
+ z39$i.$setNo preferredRecordSyntax [lindex $targets($host) 1]
+ egw_log debug "set syntax to [lindex $targets($host) 1]"
}
set hist($setNo,$i,offset) 0
eval z39$i.$setNo databaseNames $hist($setNo,$i,database)
z39$i.$setNo elementSetNames $thisElements
z39$i.$setNo recordElements $thisElements
- z39$i.$setNo preferredRecordSyntax USMARC
z39$i callback [list search-m-response $setNo $i $start $number]
if {$start == 1} {
}
set zstatus($i) 1
incr zleft
- egw_log debug "setNo=$setNo msearch " $hist($setNo,$i,query)
- z39$i.$setNo search $hist($setNo,$i,query)
+ egw_log debug "msearch host=" $hist($setNo,$i,host)
+ egw_log debug "setNo=$setNo query=" $hist($setNo,$i,query) "="
+ if {[catch {z39$i.$setNo search $hist($setNo,$i,query)}]} {
+ set zstatus($i) -1
+ incr zleft -1
+ }
} elseif {[z39$i.$setNo resultCount] >= $start} {
if {[expr $start + $number - 1] > [z39$i.$setNo resultCount]} {
set tnumber [expr [z39$i.$setNo resultCount] - $start + 1]
}
html "present<br>\n"
- z39$i.$setNo preferredRecordSyntax USMARC
z39$i callback [list search-m-response $setNo $i $start $tnumber]
incr zleft
egw_log debug "mpresent start=$start number=$tnumber"
global sessionWait
global targets
- if {$tno > 0} {
- set zz z39$tno
- set host $hist($setNo,$tno,host)
- } else {
- set zz z39
- set host $hist($setNo,host)
- }
+ set zz z39$tno
+ set host $hist($setNo,$tno,host)
if {![lindex $targets($host) 5]} {
set elements {}
break
}
}
- display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $tno
+ display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $setNo $tno
set setOffset [expr $got + $setOffset]
set toGet [expr 1 + $setMax - $setOffset]
egw_flush
}
}
+proc buttons-result-set-s {setNo targetNo setMax startPos after} {
+ global sessionId
+ global useIcons
+ global env
+ global hist
+
+ set zz z39$targetNo
+ html "<p>\n"
+ button-main
+ if {$setMax > 0 && $setMax < [$zz.$setNo resultCount]} {
+ if {!$useIcons} {
+ html "\n | "
+ }
+ html {<a href="http:} $env(SCRIPT_NAME)
+ html / $sessionId {/search.egw/} $setNo + $targetNo +
+ html [expr $setMax + 1] + [expr $setMax + $hist($setNo,maxPresent)]
+ if {$useIcons} {
+ html {"><img src="/egwgif/button-next-records.gif" }
+ html {alt="Next Records" border=0></a>}
+ } else {
+ html {">Next Records</a>}
+ }
+ }
+ if {$setMax > 0 && $startPos != "" && $startPos != "1"} {
+ if {!$useIcons} {
+ html "\n | "
+ }
+ html {<a href="http:} $env(SCRIPT_NAME)
+ html / $sessionId {/search.egw/} $setNo + $targetNo
+ html + [expr $startPos - $hist($setNo,maxPresent)]
+ html + [expr $startPos - 1]
+ if {$useIcons} {
+ html {"><img src="/egwgif/button-previous-records.gif" }
+ html {alt="Previous Records" border=0></a>}
+ } else {
+ html {">Previous Records</a>}
+ }
+ }
+ button-new-query 1 $setNo
+ button-new-target 1
+ button-view-history 0
+
+ html "<p>\n"
+}
+
+proc score-sort {l r} {
+ return [expr [lindex $r 0] - [lindex $l 0]]
+}
+
+proc display-result-set-m-score {setNo} {
+ global hist
+ global useIcons
+ global zstatus
+ global targets
+
+ set not $hist($setNo,0,host)
+ for {set i 1} {$i <= $not} {incr i} {
+ if {$zstatus($i) != 2} continue
+ set status [z39$i.$setNo responseStatus]
+ if {[lindex $status 0] != "DBOSD"} continue
+ if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
+ set nor $hist($setNo,maxPresent)
+ } else {
+ set nor $hist($setNo,$i,offset)
+ }
+ for {set j 1} {$j <= $nor} {incr j} {
+ if {![string compare [z39$i.$setNo recordType $j] WAIS]} {
+ set score [z39$i.$setNo getWAIS $j score]
+ if {$score > 0} {
+ lappend scoreArray [list $score $i $j]
+ }
+ } else {
+ lappend scoreArray [list 10 $i $j]
+ }
+ }
+ }
+ if {![info exists scoreArray]} {
+ html "<br><h3>Search produced no result</h3><br>\n"
+ return
+ }
+ set scoreSorted [lsort -command score-sort $scoreArray]
+
+ html "<ul>\n"
+ foreach r $scoreSorted {
+ set i [lindex $r 1]
+ set j [lindex $r 2]
+ display-$hist($setNo,format) z39$i.$setNo $j $setNo $i
+ }
+ html "</ul><br>\n"
+}
+
+proc display-result-set-m-server {setNo} {
+ global hist
+ global useIcons
+ global zstatus
+ global targets
+
+ set not $hist($setNo,0,host)
+ html "<dl>\n"
+ for {set i 1} {$i <= $not} {incr i} {
+ if {$zstatus($i) != 2} continue
+ html "<dt><h3>" [lindex $targets($hist($setNo,$i,host)) 0] ": "
+ set status [z39$i.$setNo responseStatus]
+ if {[lindex $status 0] == "NSD"} {
+ z39$i.$setNo nextResultSetPosition 0
+ set code [lindex $status 1]
+ set msg [lindex $status 2]
+ set addinfo [lindex $status 3]
+ html "Error</h3>\n<dd>NSD$code: $msg: $addinfo"
+ } else {
+ set r [z39$i.$setNo resultCount]
+ html "$r hits</h3>\n<dd>\n"
+
+ if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
+ set nor $hist($setNo,maxPresent)
+ } else {
+ set nor $hist($setNo,$i,offset)
+ }
+ display-rec 1 $nor display-$hist($setNo,format) $setNo $i
+ }
+ html "\n"
+ }
+ html "</dl>\n"
+}
+
+proc display-result-set-m {setNo} {
+ global hist
+ global useIcons
+ global zstatus
+ global targets
+
+ egw_log debug "sort=$hist($setNo,sort)"
+ switch $hist($setNo,sort) {
+ score {
+ display-result-set-m-score $setNo
+ }
+ default {
+ display-result-set-m-server $setNo
+ }
+ }
+}
+
+proc display-result-set-s {setNo targetNo startPos endPos} {
+ global hist
+ global useIcons
+
+ set zz z39$targetNo
+ set host $hist($setNo,$targetNo,host)
+ set idAuth $hist($setNo,$targetNo,idAuthentication)
+ set database $hist($setNo,$targetNo,database)
+ set query $hist($setNo,$targetNo,query)
+
+ set useIcons 1
+
+ if {$startPos == ""} {
+ if {[z39search $setNo 1 $targetNo B] != "1"} {
+ return
+ }
+ set r [$zz.$setNo resultCount]
+
+ set setMax [$zz.$setNo resultCount]
+ if {$setMax > $hist($setNo,maxPresent)} {
+ set setMax $hist($setNo,maxPresent)
+ }
+ buttons-result-set-s $setNo $targetNo $setMax $startPos 0
+
+ set setOffset [$zz.$setNo numberOfRecordsReturned]
+ if {$setMax > 0} {
+ html {<h3> Records 1-} $setMax " out of $r</h3>\n"
+ } else {
+ html "<h3> No hits</h3>\n"
+ }
+ egw_flush
+ html "<ul>\n"
+ display-rec 1 $setMax display-brief $setNo $targetNo
+ incr setOffset
+
+ } else {
+ if {[z39search $setNo 0 $targetNo B] != "1"} {
+ return
+ }
+ set r [$zz.$setNo resultCount]
+ set setOffset $startPos
+ set setMax [$zz.$setNo resultCount]
+ if {$setMax > $endPos} {
+ set setMax $endPos
+ }
+ buttons-result-set-s $setNo $targetNo $setMax $startPos 0
+ if {$setMax > 0} {
+ html {<h3> Records } $startPos {-} $setMax " out of $r</h3>\n"
+ } else {
+ html "<h3> No hits</h3>\n"
+ }
+ egw_flush
+ html "<ul>\n"
+ }
+ if {$setMax > 0} {
+ z39present $setNo $targetNo $setOffset $setMax display-brief B
+ }
+ html "</ul>\n"
+ set useIcons 0
+ buttons-result-set-s $setNo $targetNo $setMax $startPos 1
+}
+
proc z39history {} {
global nextSetNo
global hist
global sessionId
global targets
global html3
+ global scriptQuery
+ set targetNo 0
if {![info exists nextSetNo]} {
return
}
}
for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
if {$hist($setNo,scan) > 0} continue
- set host $hist($setNo,host)
+ set host $hist($setNo,0,host)
if {$html3} {
html {<td align=left>}
} else {
}
html [lindex $targets($host) 0]
if {$html3} {
- html {<td align=left>} [join $hist($setNo,database)]
+ html {<td align=left>} [join $hist($setNo,0,database)]
} else {
if {[llength [lindex $targets($host) 1]] > 1} {
html ": "
- foreach b $hist($setNo,database) {
+ foreach b $hist($setNo,0,database) {
html " $b"
}
}
}
if {[info exists hist($setNo,hits)]} {
html { <a href="http:} $env(SCRIPT_NAME)
- html / $sessionId {/search.egw/} $setNo + 1
+ html / $sessionId {/search.egw/} $setNo + $targetNo + 1
html + $hist($setNo,maxPresent)
if {1} {
html {">} $hist($setNo,hits) {</a>}
html "<dd>\n"
}
html { <a href="http:} $env(SCRIPT_NAME)
- html / $sessionId {/query.egw/} $host + $setNo
+ html / $sessionId / $scriptQuery / $setNo + $host
if {$html3} {
html {">}
} else {
html "<p><center>\n"
html {<img src="/egwgif/noway.gif" alt="Error">}
html "<h2>" $msga "</h2>\n"
- if {$msgb != ""} {
+ if {[string length $msgb] > 0} {
html "<h3>" $msgb "</h3>\n"
}
html "</center><p>\n"
}
-proc button-europagate {} {
+proc button-main {} {
global useIcons
html {<a href="http://europagate.dtv.dk/">}
if {$useIcons} {
html {<img src="/egwgif/button-egw.gif" alt="Europagate" border=0></a>}
} else {
- html {Europagate</a> | }
+ html {Europagate</a>}
}
}
global env
global sessionId
+ if {!$useIcons} {
+ html "\n | "
+ }
html {<a href="http:} $env(SCRIPT_NAME)
html / $sessionId {/tform.egw}
if {$useIcons} {
html {alt="Define Target" border=0></a>}
} else {
html {">Define Target</a>}
- if {$more} {
- html " | \n"
- } else {
- html "\n"
- }
}
}
global env
global sessionId
global mMode
+ global scriptTarget
- html {<a href="http:} $env(SCRIPT_NAME)
- html / $sessionId
- if {$mMode} {
- html {/mtargets.egw}
- } else {
- html {/targets.egw}
+ if {[string length $scriptTarget] == 0} return
+
+ if {!$useIcons} {
+ html "\n | "
}
+ html {<a href="http:} $env(SCRIPT_NAME)
+ html / $sessionId / $scriptTarget
if {$useIcons} {
html {"><img src="/egwgif/button-new-target.gif" }
html {alt="New Target" border=0></a>}
} else {
html {">New Target</a>}
- if {$more} {
- html " | \n"
- } else {
- html "\n"
- }
}
}
global sessionId
global nextSetNo
+ if {!$useIcons} {
+ html "\n | "
+ }
html {<a href="http:} $env(SCRIPT_NAME)
html / $sessionId {/history.egw;}
catch { html "/" $nextSetNo}
html {border=0></a>}
} else {
html {">View History</a>}
- if {$more} {
- html " | \n"
- } else {
- html "\n"
- }
}
}
global sessionId
global hist
global mMode
+ global scriptQuery
- html {<a href="http:} $env(SCRIPT_NAME)
- html / $sessionId
- if {$mMode} {
- html {/mquery.egw/} $setNo
- } else {
- html {/query.egw/} $hist($setNo,host) + $setNo
+ if {!$useIcons} {
+ html "\n | "
}
- html {">}
+ html {<a href="http:} $env(SCRIPT_NAME)
+ html / $sessionId / $scriptQuery / $setNo + $hist($setNo,0,host) {">}
+
if {$useIcons} {
html {<img src="/egwgif/button-new-query.gif" }
html {alt="New Query" border=0></a>}
} else {
html {New Query</a>}
- if {$more} {
- html " | \n"
- } else {
- html "\n"
- }
}
}
global sessionId
global hist
+ if {!$useIcons} {
+ html "\n | "
+ }
+ set targetNo 0
html {<a href="http:} $env(SCRIPT_NAME)
- html / $sessionId {/search.egw/} $setNo + {scan} {">}
+ html / $sessionId {/search.egw/} $setNo + $targetNo + {scan} {">}
if {$useIcons} {
html {<img src="/egwgif/button-scan-window.gif" }
html {alt="Scan" border=0></a>}
} else {
html {Scan</a>}
- if {$more} {
- html " | \n"
- } else {
- html "\n"
- }
}
}
}
proc splitHostSpec {host} {
- set i [string last . $host]
+ set i [string first / $host]
if {$i > 1} {
incr i -1
return [string range $host 0 $i]
return $host
}
+proc splitDatabaseSpec {host} {
+ set i [string first / $host]
+ if {$i > 1} {
+ incr i
+ regsub -all -- - [string range $host $i end] { } res
+ return $res
+ }
+ regsub -all -- - $host {} res
+ return $res
+}
+
proc mergeHostSpec {host databases} {
- return ${host}.[join $databases -]
+ return ${host}/[join $databases -]
}
proc mkAssoc {assoc host} {
global targets
if {[catch {$assoc failback fail-response}]} {
- if {[lindex $targets($host) 6] == "1"} {
+ if {![string compare [lindex $targets($host) 1] WAIS]} {
wais $assoc
} else {
ir $assoc
}
} else {
- if {[lindex $targets($host) 6] == "1"} {
+ if {![string compare [lindex $targets($host) 1] WAIS]} {
if {[$assoc comstack] == "wais"} return
wais $assoc
} else {
ir $assoc
}
}
+}
+
+if {[info exists utilExtension]} {
+ source $utilExtension
}
\ No newline at end of file