\n" + html {
\n" + html "Connecting to target " $thisHost "
\n" set zstatus($i) -1 - if {![catch {z39$i connect $host}]} { + if {![catch {z39$i connect $thisHost}]} { incr zleft } } while {$zleft > 0} { egw_log debug "Waiting for init response" - if {[catch {egw_wait zleft 10}]} { + if {[catch {egw_wait zleft 20}]} { break } } set zleft 0 for {set i 1} {$i <= $not} {incr i} { - html "host " $hist($setNo,$i,host) ": " - if {$zstatus($i) >= 1} { - html "ok
\n" + html "host " [splitHostSpec $hist($setNo,$i,host)] ": " + egw_log debug "i=$i zstatus=$zstatus($i)" + if {$zstatus($i) < 1} { + html "fail
\n" + continue + } + if {[catch [list z39$i.$setNo preferredRecordSyntax USMARC]]} { + html "ok
\n" ir-set z39$i.$setNo z39$i set hist($setNo,$i,offset) 0 eval z39$i.$setNo databaseNames $hist($setNo,$i,database) @@ -840,38 +887,74 @@ proc z39msearch {setNo piggy elements} { } z39$i.$setNo smallSetElementSetNames $thisElements z39$i.$setNo mediumSetElementSetNames $thisElements + z39$i.$setNo elementSetNames $thisElements z39$i.$setNo recordElements $thisElements z39$i.$setNo preferredRecordSyntax USMARC - z39$i callback [list search-m-response $setNo $i] + z39$i callback [list search-m-response $setNo $i $start $number] - if {$piggy} { + if {$start == 1} { z39$i.$setNo largeSetLowerBound 999999 z39$i.$setNo smallSetUpperBound 0 - z39$i.$setNo mediumSetPresentNumber $hist($setNo,maxPresent) + z39$i.$setNo mediumSetPresentNumber $number } else { z39$i.$setNo largeSetLowerBound 2 z39$i.$setNo smallSetUpperBound 0 z39$i.$setNo mediumSetPresentNumber 0 } set zstatus($i) 1 - egw_log debug "search " $hist($setNo,$i,query) + incr zleft + egw_log debug "setNo=$setNo msearch " $hist($setNo,$i,query) z39$i.$setNo search $hist($setNo,$i,query) + } elseif {[z39$i.$setNo resultCount] >= $start} { + if {[expr $start + $number - 1] > [z39$i.$setNo resultCount]} { + set tnumber [expr [z39$i.$setNo resultCount] - $start + 1] + } else { + set tnumber $number + } + if {![lindex $targets($hist($setNo,$i,host)) 5]} { + set thisElements {} + } else { + set thisElements $elements + } + z39$i.$setNo smallSetElementSetNames $thisElements + z39$i.$setNo mediumSetElementSetNames $thisElements + z39$i.$setNo elementSetNames $thisElements + z39$i.$setNo recordElements $thisElements + + for {set n 0} {$n < $tnumber} {incr n} { + if {[z39$i.$setNo type [expr $start + $n]] == ""} { + if {$n > 0} { + egw_log debug "failed on $n" + } + break + } + } + if {$n == $tnumber} { + html "cached
\n" + continue + } + + html "present
\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" + z39$i.$setNo present $start $tnumber } else { - html "fail
\n" + html "ok
\n" } } while {$zleft > 0} { - egw_log debug "Waiting for search response" - if {[catch {egw_wait zleft 30}]} { + egw_log debug "Waiting for search/present response" + if {[catch {egw_wait zleft 60}]} { break } } for {set i 1} {$i <= $not} {incr i} { if {$zstatus($i) != 2} continue set status [z39$i.$setNo responseStatus] - if {[lindex $status 0] != "NSD"} { + if {0 && [lindex $status 0] != "NSD"} { set hist($setNo,$i,offset) [z39$i.$setNo numberOfRecordsReturned] } } @@ -938,45 +1021,92 @@ proc z39history {} { global env global sessionId global targets + global html3 if {![info exists nextSetNo]} { return } - html "
History
- } [lindex $targets($host) 0]
- if {[llength [lindex $targets($host) 1]] > 1} {
- html ": "
- foreach b $hist($setNo,database) {
- html " $b"
+ if {$html3} {
+ html {
} + } else { + html { - } + } + html [lindex $targets($host) 0] + if {$html3} { + html {
} [join $hist($setNo,database)] + } else { + if {[llength [lindex $targets($host) 1]] > 1} { + html ": " + foreach b $hist($setNo,database) { + html " $b" + } } + html {. } + } + if {$html3} { + html { } } - html {. } - if {[info exists hist($setNo,hits)]} { html { Result: } $hist($setNo,hits) { hits.} + if {1} { + html {">} $hist($setNo,hits) {} + } else { + html {">Result: } $hist($setNo,hits) { hits.} + } + } else { + if {$html3} { + html {Failed} + } else { + html {Search failed.} + } + } + if {$html3} { + html { } } else { - html {Search failed.} + html " - \n" } - html "
- \n" html { Query: } + html / $sessionId {/query.egw/} $host + $setNo + if {$html3} { + html {">} + } else { + html {">Query: } + } set op {} for {set i 1} {$i <= 3} {incr i} { if {[string length $hist($setNo,form,entry$i)] > 0} { html " " [join $op " "] " " - html $hist($setNo,form,menu$i) "=" $hist($setNo,form,entry$i) + html [join $hist($setNo,form,menu$i)] "=" + html $hist($setNo,form,entry$i) set op $hist($setNo,form,logic$i) } } + if {$html3} { + html {
} "\n" + } } - html "\n" + if {$html3} { + html { - } + } + html [lindex $targets($host) 0] + if {$html3} { + html {
\n" + html "
History
\n" + if {$html3} { + html {
| Target} + html { | Database} + html { | Hits} + html { | Query} + html { |
} + } else { + html {
}
} else {
- html {Europagate | }
+ html {Europagate | }
}
}
@@ -1007,9 +1138,9 @@ proc button-define-target {more} {
html / $sessionId {/tform.egw}
if {$useIcons} {
html {">
}
+ html {alt="Define Target" border=0>}
} else {
- html {">New Target}
+ html {">Define Target}
if {$more} {
html " | \n"
} else {
@@ -1022,9 +1153,15 @@ proc button-new-target {more} {
global useIcons
global env
global sessionId
+ global mMode
html {
}
@@ -1065,9 +1202,16 @@ proc button-new-query {more setNo} {
global env
global sessionId
global hist
+ global mMode
html {}
+ html / $sessionId
+ if {$mMode} {
+ html {/mquery.egw/} $setNo
+ } else {
+ html {/query.egw/} $hist($setNo,host) + $setNo
+ }
+ html {">}
if {$useIcons} {
html {
}
@@ -1105,7 +1249,20 @@ proc button-scan-window {more setNo} {
proc maintenance {} {
html {This page is maintained by } html { Peter Wad Hansen .} - html {Last modified 24. january 1996.
} + html {Last modified 29. january 1996.
} html { This and the following pages are under construction and } html {will continue to be so until the end of January 1996.} } + +proc splitHostSpec {host} { + set i [string last . $host] + if {$i > 1} { + incr i -1 + return [string range $host 0 $i] + } + return $host +} + +proc mergeHostSpec {host databases} { + return ${host}.[join $databases -] +}