X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=8740be44742c7b7eab30d3ea135425806e25fca6;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=406662ddf4e4270dc4c66789c934f37aae04bd82;hpb=09f416a26c1c7e35ead317106f985774ec0c97bd;p=egate.git diff --git a/www/z39util.tcl b/www/z39util.tcl index 406662d..8740be4 100644 --- a/www/z39util.tcl +++ b/www/z39util.tcl @@ -1,5 +1,5 @@ # -# $Id: z39util.tcl,v 1.13 1995/12/21 15:49:53 adam Exp $ +# $Id: z39util.tcl,v 1.36 1996/03/07 12:46:09 adam Exp $ # proc saveState {} { uplevel #0 { @@ -65,11 +65,11 @@ proc fail-response {} { set sessionWait -1 } -proc display-brief {zset no tno} { +proc display-brief {zset no setNo targetNo} { global env - global setNo global sessionId + html {
  • } set type [$zset type $no] if {$type == "SD"} { set err [lindex [$zset diag $no] 1] @@ -83,20 +83,85 @@ proc display-brief {zset no tno} { if {$type != "DB"} { return } - html "${no}" set rtype [$zset recordType $no] if {$rtype == "SUTRS"} { html [join [$zset getSutrs $no]] html "
    \n" return - } + } + if {$rtype == "WAIS"} { + html { } + html [join [$zset getWAIS $no headline]] + html {} + html "
    \n" + return + } if {![catch { - set title [lindex [$zset getMarc $no field 245 * a] 0] - set year [lindex [$zset getMarc $no field 260 * c] 0] - } ] } { - html { } $title {} " ${year} " + 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 { } + 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 + } + if {$nope} { + set v [join $cover ""] + if {[string length $v] > 40} { + set nope 0 + html [string range $v 0 38] "..." + } 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" } @@ -149,7 +214,7 @@ proc display-raw {zset no tno} { } html $data } - htmlr {
    } + html "
    \n" } } @@ -238,7 +303,82 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} { } } -proc display-full {zset no tno} { +proc display-full-wais {zset no setNo targetNo} { + global env + global hist + global sessionId + + 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 { + { + set element title + } + { + set element dateOfLastModification + } + { + set element controlIdentifier + } + { + set element lastChecked + } + { + set element bytes + } + { + set element linkage + } + { + incr i + } +
  • { + set element "$i,linkage" + } + { + set element "$i,title" + } + default { + set element junk + } + } + } + if {![info exists data(title)] || ![info exists data(linkage)]} { + html "" [join [$zset getWAIS $no text]] "\n" + return + } + html {Title: } {} $data(title) "
    \n" + html {URL: } $data(linkage) "
    \n" + html {Score: } [$zset getWAIS $no score] "
    \n" + html {Lines: } [$zset getWAIS $no lines] "
    \n" + if {[info exists data(bytes)]} { + html {Bytes: } $data(bytes) "
    \n" + } + if {[info exists data(dateOfLastModification)]} { + html {Last modified: } $data(dateOfLastModification) "
    \n" + } + if {[info exists data(lastChecked)]} { + html {Last checked: } $data(lastChecked) "
    \n" + } + html {} + html {Similar WAIS record
    } + html "\n" +} + +proc display-full {zset no setNo targetNo} { set type [$zset type $no] if {$type == "SD"} { set err [lindex [$zset diag $no] 1] @@ -256,7 +396,11 @@ proc display-full {zset no tno} { if {$rtype == "SUTRS"} { html [join [$zset getSutrs $no]] "
    \n" return - } + } + if {$rtype == "WAIS"} { + display-full-wais $zset $no $setNo $targetNo + return + } if {[catch {set r [$zset getMarc $no line * * *]}]} { html "Unknown record type: $rtype
    \n" return @@ -268,8 +412,17 @@ proc display-full {zset no tno} { } set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "] if {$n == 0} { - set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "] + set n [dl-marc-field $zset $no 110 a "Corporate Name" {} ", "] } + set n [dl-marc-field $zset $no 711 a "Meeting Name" {} ", "] + if {$n > 0} { + dd-marc-field $zset $no 711 {[bndc]} " " "" + } else { + set n [dl-marc-field $zset $no 111 a "Meeting Name" {} ", "] + if {$n > 0} { + dd-marc-field $zset $no 111 {[bndc]} " " " " + } + } set n [dl-marc-field $zset $no 245 {a} "Title" {} " "] if {$n > 0} { dd-marc-field $zset $no 245 b "" "" @@ -331,9 +484,9 @@ proc display-full {zset no tno} { if {"x$url" != "x"} { html "
    URL\n" if {"x$sp" == "x"} { - set sp reference + 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" @@ -345,36 +498,26 @@ proc display-full {zset no tno} { } -proc display-rec {from to dfunc tno} { - global setNo - - if {$tno > 0} { - while {$from <= $to} { - eval "$dfunc z39${tno}.${setNo} $from $tno" - incr from - } - } else { - while {$from <= $to} { - eval "$dfunc z39.${setNo} $from 0" - incr from - } +proc display-rec {from to dfunc setNo targetNo} { + while {$from <= $to} { + eval "$dfunc z39${targetNo}.${setNo} $from $setNo $targetNo" + incr from } } -proc build-scan {t ilines} { +proc build-scan {t i} { global targets - for {set i 1} {$i <= $ilines} {incr i} { - set term [wform entry$i] - if {$term != ""} { - set field [wform menu$i] - foreach x [lindex $targets($t) 2] { - if {[lindex $x 0] == $field} { - set attr [lindex $x 1] - } + set term [egw_form entry$i] + if {$term != ""} { + set field [join [egw_form menu$i]] + set attr {Title} + foreach x [lindex $targets($t) 2] { + if {[lindex $x 0] == $field} { + set attr [lindex $x 1] } - return [list $term $attr] } + return [list $term $attr] } return "" } @@ -385,9 +528,18 @@ proc build-query {t ilines} { set op {} set q {} for {set i 1} {$i <= $ilines} {incr i} { - set term [wform entry$i] - if {$term != ""} { - set field [wform menu$i] + set term [join [egw_form entry$i]] + if {[lindex $targets($t) 6] == "1"} { + if {[string length $op] == 0} { + set q $term + } else { + set q "$term $q" + } + set op [egw_form logic$i] + continue + } + if {[string length $term] > 0} { + set field [join [egw_form menu$i]] foreach x [lindex $targets($t) 2] { if {[lindex $x 0] == $field} { set attr [lindex $x 1] @@ -395,92 +547,83 @@ proc build-query {t ilines} { } switch $op { And - { set q "@and $q ${attr} ${term}" } + { set q "@and $q ${attr} \"${term}\"" } Or - { set q "@or $q ${attr} ${term}" } + { set q "@or $q ${attr} \"${term}\"" } {And not} - { set q "@not $q ${attr} ${term}" } + { set q "@not $q ${attr} \"${term}\"" } {} - { set q "${attr} ${term}" } + { set q "${attr} \"${term}\"" } } - set op [wform logic$i] + set op [egw_form logic$i] } } return $q } -proc z39scan {setNo scanNo tno scanLines scanPos} { +proc z39scan {setNo scanNo tno scanLines scanPos cache} { global hist 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) - } - if {[catch [list $zz failback fail-response]]} { - ir $zz - } + 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 "" } set zs $zz.s$scanNo.$setNo $zz callback ok-response $zz failback fail-response - if {$oldHost != $host} { + set thisHost [splitHostSpec $host] + if {[string compare $oldHost $thisHost]} { catch [list $zz disconnect] set sessionWait 0 - if {[catch [list $zz connect $host]]} { - displayError "Cannot connect to target" $host + if {[catch [list $zz connect $thisHost]]} { + displayError "Cannot connect to target" $thisHost return 0 } elseif {$sessionWait == 0} { - if {[catch {zwait sessionWait 300}]} { + if {[catch {egw_wait sessionWait 300}]} { $zz disconnect - displayError "Cannot connect to target" $host + displayError "Cannot connect to target" $thisHost return 0 } if {$sessionWait != 1} { - displayError "Cannot connect to target" $host + displayError "Cannot connect to target" $thisHost return 0 } } $zz idAuthentication $idAuth set sessionWait 0 if {[catch {$zz init}]} { - displayError "Cannot initialize target" $host + displayError "Cannot initialize target" $thisHost $zz disconnect return 0 } - if {[catch {zwait sessionWait 60}]} { - displayError "Cannot initialize target" $host + if {[catch {egw_wait sessionWait 60}]} { + displayError "Cannot initialize target" $thisHost $zz disconnect return 0 } if {$sessionWait != "1"} { - displayError "Cannot initialize target" $host + displayError "Cannot initialize target" $thisHost $zz disconnect return 0 } if {![$zz initResult]} { set u [$zz userInformationField] $zz disconnect - displayError "Cannot initialize target $host" $u + displayError "Cannot initialize target $thisHost" $u return 0 } } else { - if {![catch [list $zs numberOfTermsRequested 5]]} { + if {$cache && ![catch [list $zs numberOfTermsRequested 5]]} { return 1 } } @@ -493,11 +636,12 @@ proc z39scan {setNo scanNo tno scanLines scanPos} { $zz callback [list scan-response $zs] + egw_log debug "scan: ${scanAttr} ${scanTerm}" set sessionWait 0 $zs scan "${scanAttr} ${scanTerm}" - if {[catch {zwait sessionWait 600}]} { - wlog debug "timeout/cancel in scan" + if {[catch {egw_wait sessionWait 60}]} { + egw_log debug "timeout/cancel in scan" displayError "Timeout in scan" {} html "\n" $zz disconnect @@ -517,24 +661,52 @@ proc z39scan {setNo scanNo tno scanLines scanPos} { proc display-scan {setNo scanNo tno} { global hist global targets + global env + global sessionId - 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 {$m > 0} { + set t [lindex [$zs scanLine 0] 1] + if {$tno > 0} { + set hist($setNo,$tno,[expr $scanNo - 1],scanTerm) $t + } else { + set hist($setNo,[expr $scanNo - 1],scanTerm) $t + } + set t [lindex [$zs scanLine [expr $m - 1]] 1] + if {$tno > 0} { + set hist($setNo,$tno,[expr $scanNo + 1],scanTerm) $t + } else { + set hist($setNo,[expr $scanNo + 1],scanTerm) $t + } + } + html {} + html {} \n - html "
    \n" for {set i 0} {$i < $m} {incr i} { - html "
    " + html {
    } \n } - html "\n" + html { 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) - } - if {[catch [list $zz failback fail-response]]} { - ir $zz - } + 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 "" } $zz callback ok-response $zz failback fail-response - if {$oldHost != $host} { + set thisHost [splitHostSpec $host] + if {[string compare $oldHost $thisHost]} { catch [list $zz disconnect] set sessionWait 0 - if {[catch [list $zz connect $host]]} { - displayError "Cannot connect to target" $host + if {[catch [list $zz connect $thisHost]]} { + displayError "Cannot connect to target" $thisHost return 0 } elseif {$sessionWait == 0} { - if {[catch {zwait sessionWait 300}]} { + if {[catch {egw_wait sessionWait 300}]} { $zz disconnect - displayError "Cannot connect to target" $host + displayError "Cannot connect to target" $thisHost return 0 } if {$sessionWait != 1} { - displayError "Cannot connect to target" $host + displayError "Cannot connect to target" $thisHost return 0 } } $zz idAuthentication $idAuth set sessionWait 0 if {[catch {$zz init}]} { - displayError "Cannot initialize target" $host + displayError "Cannot initialize target" $thisHost $zz disconnect return 0 } - if {[catch {zwait sessionWait 60}]} { - displayError "Cannot initialize target" $host + if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} { + displayError "Cannot initialize target" $thisHost $zz disconnect return 0 } if {$sessionWait != "1"} { - displayError "Cannot initialize target" $host + displayError "Cannot initialize target" $thisHost $zz disconnect return 0 } if {![$zz initResult]} { set u [$zz userInformationField] $zz disconnect - displayError "Cannot initialize target $host" $u + displayError "Cannot initialize target $thisHost" $u return 0 } - } else { - if {![catch [list $zz.$setNo smallSetUpperBound 0]]} { - return 1 + } elseif {![catch [list $zz.$setNo smallSetUpperBound 0]]} { + if {$tno > 0} { + if {[info exists hist($setNo,$tno,hits)]} { + return 1 + } + } else { + if {[info exists hist($setNo,hits)]} { + return 1 + } } } - ir-set $zz.$setNo $zz + if {[lindex $targets($host) 6] == "1"} { + wais-set $zz.$setNo $zz + } else { + ir-set $zz.$setNo $zz + } if {![lindex $targets($host) 5]} { set elements {} } @@ -618,7 +793,7 @@ proc z39search {setNo piggy tno elements} { $zz.$setNo mediumSetElementSetNames $elements $zz.$setNo recordElements $elements - wlog debug "database=$database" + egw_log debug "database=$database" eval $zz.$setNo databaseNames $database $zz.$setNo preferredRecordSyntax USMARC @@ -634,10 +809,16 @@ proc z39search {setNo piggy tno elements} { $zz.$setNo mediumSetPresentNumber 0 } set sessionWait 0 - $zz.$setNo search $query + egw_log debug "search: $query" + + if {[info exists docId]} { + $zz.$setNo search $query $docId + } else { + $zz.$setNo search $query + } - if {[catch {zwait sessionWait 600}]} { - wlog debug "timeout/cancel in search" + if {!$sessionWait && [catch {egw_wait sessionWait 60}]} { + egw_log debug "timeout/cancel in search" displayError "Timeout in search" {} html "\n" $zz disconnect @@ -660,17 +841,22 @@ proc init-m-response {i} { global zstatus global zleft - wlog debug "init-m-response" + 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} { global zstatus global zleft - wlog debug "connect-m-response" + egw_log debug "connect-m-response" z39$i callback [list init-m-response $i] if {[catch {z39$i init}]} { set zstatus($i) -1 @@ -682,36 +868,72 @@ proc fail-m-response {i} { global zstatus global zleft - wlog debug "fail-m-response" + egw_log debug "fail-m-response" set zstatus($i) -1 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] == "OK"} { + set nor 0 + } elseif {[lindex $status 0] == "DBOSD"} { + set nor [z39$i.$setNo numberOfRecordsReturned] + } else { + egw_log debug "search-m-response2" + incr zleft -1 + set zstatus($i) 2 + return + } + set hist($setNo,$i,hits) [z39$i.$setNo resultCount] + 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}]} { - ir z39$i - } - if {[catch {set oldHost [z39$i connect]}]} { - set oldHost "" - } - if {$oldHost != $host} { + mkAssoc z39$i $host + set oldHost [z39$i connect] + set thisHost [splitHostSpec $host] + if {[string compare $oldHost $thisHost]} { catch {z39$i disconnect} } z39$i callback [list connect-m-response $i] @@ -721,29 +943,47 @@ proc z39msearch {setNo piggy elements} { for {set i 1} {$i <= $not} {incr i} { set oldHost [z39$i connect] set host $hist($setNo,$i,host) - if {$oldHost == $host} { - set zstatus($i) 1 + set thisHost [splitHostSpec $host] + if {![string compare $oldHost $thisHost]} { continue } + egw_log debug "old=$oldHost this=$thisHost" z39$i idAuthentication $hist($setNo,$i,idAuthentication) - html "Connecting to target " $host "
    \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} { - wlog debug "Waiting for init response" - if {[catch {zwait zleft 10}]} { + egw_log debug "Waiting for init response" + 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" - ir-set z39$i.$setNo z39$i + set host $hist($setNo,$i,host) + if {$debug} { + html "host " [splitHostSpec $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" + } + + if {[lindex $targets($host) 6] == "1"} { + wais-set z39$i.$setNo z39$i + } else { + ir-set z39$i.$setNo z39$i + } set hist($setNo,$i,offset) 0 eval z39$i.$setNo databaseNames $hist($setNo,$i,database) @@ -754,38 +994,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 - wlog 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} { - wlog debug "Waiting for search response" - if {[catch {zwait 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] } } @@ -796,13 +1080,8 @@ proc z39present {setNo tno setOffset setMax dfunc elements} { 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 {} @@ -816,15 +1095,15 @@ 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 } } if {$got < $toGet} { set sessionWait 0 $zz.$setNo present $setOffset $toGet - if {[catch {zwait sessionWait 300}]} { - wlog debug "timeout/cancel in present" + if {[catch {egw_wait sessionWait 300}]} { + egw_log debug "timeout/cancel in present" $zz disconnect break } @@ -839,11 +1118,112 @@ proc z39present {setNo tno setOffset setMax dfunc 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] - wflush + 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 "

    \n" + button-europagate + if {$setMax > 0 && $setMax < [$zz.$setNo resultCount]} { + html {Next Records} + } else { + html {">Next Records} " | \n" + } + } + if {$setMax > 0 && $startPos != "" && $startPos != "1"} { + html {} + } else { + html {">Previous Records} " | \n" + } + } + button-new-query 1 $setNo + button-new-target 1 + button-view-history 0 + + html "

    \n" +} + +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 {

    Records 1-} $setMax " out of $r

    \n" + } else { + html "

    No hits

    \n" + } + egw_flush + html "
      \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 {

      Records } $startPos {-} $setMax " out of $r

      \n" + } else { + html "

      No hits

      \n" + } + egw_flush + html "
        \n" + } + if {$setMax > 0} { + z39present $setNo $targetNo $setOffset $setMax display-brief B } + html "
      \n" + set useIcons 0 + buttons-result-set-s $setNo $targetNo $setMax $startPos 1 } proc z39history {} { @@ -852,37 +1232,98 @@ proc z39history {} { global env global sessionId global targets + global html3 + set targetNo 0 if {![info exists nextSetNo]} { return } - html "

      History

      \n" + html "

      History


      \n" + if {$html3} { + html {
    Scan term} + html {Hits} + html {
    } + if {0} { + regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm + html {} + } else { + regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm + html {} + } html [lindex [$zs scanLine $i] 1] - html ": " + html {} + html {} html [lindex [$zs scanLine $i] 2] - html "\n" + html {
    } + html {} "\n" + } else { + html {
    } "\n" + } for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} { - html {
    } [lindex $targets($hist($setNo,host)) 0] - if {[llength $hist($setNo,database)] > 1} { - html ": " - foreach b $hist($setNo,database) { - html " $b" + if {$hist($setNo,scan) > 0} continue + set host $hist($setNo,0,host) + if {$html3} { + html {
    } "\n" } - html "\n" } - html "\n" + if {$html3} { + html {
    Target} + html {Database} + html {Hits} + html {Query} + html {
    } + } else { + html {
    } + } + html [lindex $targets($host) 0] + if {$html3} { + html {
    		} [join $hist($setNo,0,database)] + } else { + if {[llength [lindex $targets($host) 1]] > 1} { + html ": " + foreach b $hist($setNo,0,database) { + html " $b" + } } + html {. } + } + if {$html3} { + html {} } - html "\n" - html "
    " if {[info exists hist($setNo,hits)]} { - html $hist($setNo,hits) " hits" + html { } $hist($setNo,hits) {} + } else { + html {">Result: } $hist($setNo,hits) { hits.} + } } else { - html failed + if {$html3} { + html {Failed} + } else { + html {Search failed.} + } + } + if {$html3} { + html {
    		} + } else { + html "
    \n" + } + 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 [join $hist($setNo,form,menu$i)] "=" + html $hist($setNo,form,entry$i) + set op $hist($setNo,form,logic$i) + } + } + if {$html3} { + html {

    } + } else { + html {} + } + html "\n" } proc displayError {msga msgb} { html "

    \n" - html {} + html {Error} html "

    " $msga "

    \n" if {$msgb != ""} { html "

    " $msgb "

    \n" @@ -890,4 +1331,171 @@ proc displayError {msga msgb} { html "

    \n" } -set useIcons 1 \ No newline at end of file +proc button-europagate {} { + global useIcons + html {} + if {$useIcons} { + html {Europagate} + } else { + html {Europagate | } + } +} + +proc button-define-target {more} { + global useIcons + global env + global sessionId + + html {} + } else { + html {">Define Target} + if {$more} { + html " | \n" + } else { + html "\n" + } + } +} + +proc button-new-target {more} { + global useIcons + global env + global sessionId + global mMode + + html {} + } else { + html {">New Target} + if {$more} { + html " | \n" + } else { + html "\n" + } + } +} + +proc button-view-history {more} { + global useIcons + global env + global sessionId + global nextSetNo + + html {View History} + } else { + html {">View History} + if {$more} { + html " | \n" + } else { + html "\n" + } + } +} + +proc button-new-query {more setNo} { + global useIcons + global env + global sessionId + global hist + global mMode + + html {} + if {$useIcons} { + html {} + } else { + html {New Query} + if {$more} { + html " | \n" + } else { + html "\n" + } + } +} + +proc button-scan-window {more setNo} { + global useIcons + global env + global sessionId + global hist + + set targetNo 0 + html {} + if {$useIcons} { + html {} + } else { + html {Scan} + if {$more} { + html " | \n" + } else { + html "\n" + } + } +} + +proc maintenance {} { + html {

    This page is maintained by } + html { Peter Wad Hansen .} + 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 -] +} + +proc mkAssoc {assoc host} { + global targets + + if {[catch {$assoc failback fail-response}]} { + if {[lindex $targets($host) 6] == "1"} { + wais $assoc + } else { + ir $assoc + } + } else { + if {[lindex $targets($host) 6] == "1"} { + if {[$assoc comstack] == "wais"} return + wais $assoc + } else { + if {[$assoc comstack] == "tcpip"} return + ir $assoc + } + } +} \ No newline at end of file