X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=cafca965a763321a9e917eb2f962efb6315caf36;hb=3c1a04c3c1aa9f80cd7b3f9a884968e6fc1b7220;hp=e7030623a71b93996771135a151bf7267dcefd80;hpb=3bbb844581f17ede97f6eb7ea8022b69a0859420;p=egate.git diff --git a/www/z39util.tcl b/www/z39util.tcl index e703062..cafca96 100644 --- a/www/z39util.tcl +++ b/www/z39util.tcl @@ -1,5 +1,5 @@ # -# $Id: z39util.tcl,v 1.27 1996/01/26 17:41:26 adam Exp $ +# $Id: z39util.tcl,v 1.31 1996/02/20 16:07:39 adam Exp $ # proc saveState {} { uplevel #0 { @@ -104,7 +104,7 @@ proc display-brief {zset no tno} { 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 { } set p 0 @@ -140,12 +140,22 @@ proc display-brief {zset no tno} { if {$nope} { set v [join $cover ""] if {[string length $v] > 40} { + set nope 0 html [string range $v 0 38] "..." - } else { + } elseif {[string length $v] > 0} { + set nope 0 html $v + } else { + html "No Title" } } html { } + } else { + html { } + html {No Title} + html { } + html "Error: " $dispError "\n" } html "
\n" } @@ -391,7 +401,7 @@ proc display-full {zset no tno} { if {"x$sp" == "x"} { set sp $url } - html {
} [join $sp] "\n" + html {
} [join $sp] "\n" } dl-marc-field $zset $no 037 {[abc]} "Acquisition" {} "
\n" dl-marc-field $zset $no 037 {[f6]} "Form of issue" {} "
\n" @@ -601,7 +611,7 @@ proc display-scan {setNo scanNo tno} { set hist($setNo,[expr $scanNo + 1],scanTerm) $t } } - html {} + html {
} html {} \n @@ -731,7 +741,7 @@ proc z39search {setNo piggy tno elements} { egw_log debug "search: $query" $zz.$setNo search $query - if {[catch {egw_wait sessionWait 600}]} { + if {[catch {egw_wait sessionWait 60}]} { egw_log debug "timeout/cancel in search" displayError "Timeout in search" {} html "\n" @@ -757,8 +767,13 @@ proc init-m-response {i} { egw_log debug "init-m-response" - set zstatus($i) 1 incr zleft -1 + if {![z39$i initResult]} { + set zstatus($i) -1 + z39$i disconnect + return + } + set zstatus($i) 1 } proc connect-m-response {i} { @@ -782,30 +797,63 @@ proc fail-m-response {i} { incr zleft -1 } -proc search-m-response {setNo i} { +proc search-m-response {setNo i start number} { global zleft global zstatus + global hist - incr zleft -1 - set zstatus($i) 2 + egw_log debug "search-m-response" + set status [z39$i.$setNo responseStatus] + egw_log debug "search-m-response1" + if {[lindex $status 0] != "DBOSD"} { + egw_log debug "search-m-response2" + incr zleft -1 + set zstatus($i) 2 + return + } + set nor [z39$i.$setNo numberOfRecordsReturned] + egw_log debug "search-m-response3" + set hist($setNo,$i,offset) [expr $start + $nor -1] + if {[expr $nor + $start] > [z39$i.$setNo resultCount]} { + egw_log debug "search-m-response4" + incr zleft -1 + set zstatus($i) 2 + return + } + egw_log debug "search-m-response5" + if {$nor >= $number} { + egw_log debug "search-m-response6 nor=$nor number=$number" + incr zleft -1 + set zstatus($i) 2 + return + } + egw_log debug "search-m-response7" + set start [expr $start + $nor] + set number [expr $number - $nor] + if {[expr $start + $number - 1] > [z39$i.$setNo resultCount]} { + set number [expr [z39$i.$setNo resultCount] - $start + 1] + } + z39$i callback [list search-m-response $setNo $i $start $number] + egw_log debug "mpresent start=$number number=$number" + z39$i.$setNo present $start $number } -proc z39msearch {setNo piggy elements} { +proc z39msearch {setNo elements start number cache} { global zleft global zstatus global hist global targets + global debug set not $hist($setNo,0,host) + egw_log debug "z39msearch start=$start number=$number elements=$elements" for {set i 1} {$i <= $not} {incr i} { set host $hist($setNo,$i,host) - if {[catch {z39 failback fail-response}]} { + if {[catch [list z39$i failback fail-m-response $i]]} { ir z39$i } - if {[catch {set oldHost [z39$i connect]}]} { - set oldHost "" - } + set oldHost [z39$i connect] set thisHost [splitHostSpec $host] if {$oldHost != $thisHost} { catch {z39$i disconnect} @@ -819,9 +867,9 @@ proc z39msearch {setNo piggy elements} { set host $hist($setNo,$i,host) set thisHost [splitHostSpec $host] if {$oldHost == $thisHost} { - set zstatus($i) 1 continue } + egw_log debug "old=$oldHost this=$thisHost" z39$i idAuthentication $hist($setNo,$i,idAuthentication) html "Connecting to target " $thisHost "
\n" set zstatus($i) -1 @@ -831,15 +879,26 @@ proc z39msearch {setNo piggy elements} { } 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 " [splitHostSpec $hist($setNo,$i,host)] ": " - if {$zstatus($i) >= 1} { - html "ok
\n" + if {$debug} { + html "host " [splitHostSpec $hist($setNo,$i,host)] ": " + } + egw_log debug "i=$i zstatus=$zstatus($i)" + if {$zstatus($i) < 1} { + if {$debug} { + html "fail
\n" + } + continue + } + if {[catch [list z39$i.$setNo preferredRecordSyntax USMARC]]} { + if {$debug} { + 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) @@ -851,38 +910,82 @@ 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 recordType [expr $start + $n]] == ""} { + if {$n > 0} { + egw_log debug "failed on $n" + } + if {$debug} { + html "no record at #" [expr $start + $n] + html " el=-" $thisElements "-" + } + break + } + } + if {$n == $tnumber} { + if {$debug} { + 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" + if {$debug} { + 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] } } @@ -913,7 +1016,7 @@ proc z39present {setNo tno setOffset setMax dfunc elements} { while {$setMax > 0 && $toGet > 0} { for {set got 0} {$got < $toGet} {incr got} { - if {[$zz.$setNo type [expr $setOffset + $got]] == ""} { + if {[$zz.$setNo recordType [expr $setOffset + $got]] == ""} { break } } @@ -957,10 +1060,10 @@ proc z39history {} { html "

History


\n" if {$html3} { html {
Scan term} html {Hits} html {
} - html {} "\n" } else { html {
} "\n" @@ -1177,7 +1280,7 @@ proc button-scan-window {more setNo} { proc maintenance {} { html {
This page is maintained by } html { Peter Wad Hansen .} - html {Last modified 26. 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.} }
Target} - html {Database} - html {Hits} - html {Query} + html {Target} + html {Database} + html {Hits} + html {Query} html {