#
-# $Id: z39util.tcl,v 1.22 1996/01/23 14:22:03 adam Exp $
+# $Id: z39util.tcl,v 1.23 1996/01/24 08:27:23 adam Exp $
#
proc saveState {} {
uplevel #0 {
}
html $data
}
- htmlr {<br>}
+ html "<br>\n"
}
}
proc build-scan {t i} {
global targets
- set term [wform entry$i]
+ set term [egw_form entry$i]
if {$term != ""} {
- set field [join [wform menu$i]]
+ set field [join [egw_form menu$i]]
set attr {Title}
foreach x [lindex $targets($t) 2] {
if {[lindex $x 0] == $field} {
set op {}
set q {}
for {set i 1} {$i <= $ilines} {incr i} {
- set term [join [wform entry$i]]
+ set term [join [egw_form entry$i]]
if {[string length $term] > 0} {
- set field [join [wform menu$i]]
+ set field [join [egw_form menu$i]]
foreach x [lindex $targets($t) 2] {
if {[lindex $x 0] == $field} {
set attr [lindex $x 1]
{}
{ set q "${attr} ${term}" }
}
- set op [wform logic$i]
+ set op [egw_form logic$i]
}
}
return $q
displayError "Cannot connect to target" $host
return 0
} elseif {$sessionWait == 0} {
- if {[catch {zwait sessionWait 300}]} {
+ if {[catch {egw_wait sessionWait 300}]} {
$zz disconnect
displayError "Cannot connect to target" $host
return 0
$zz disconnect
return 0
}
- if {[catch {zwait sessionWait 60}]} {
+ if {[catch {egw_wait sessionWait 60}]} {
displayError "Cannot initialize target" $host
$zz disconnect
return 0
set sessionWait 0
$zs scan "${scanAttr} ${scanTerm}"
- if {[catch {zwait sessionWait 60}]} {
- wlog debug "timeout/cancel in scan"
+ if {[catch {egw_wait sessionWait 60}]} {
+ egw_log debug "timeout/cancel in scan"
displayError "Timeout in scan" {}
html "</body></html>\n"
$zz disconnect
displayError "Cannot connect to target" $host
return 0
} elseif {$sessionWait == 0} {
- if {[catch {zwait sessionWait 300}]} {
+ if {[catch {egw_wait sessionWait 300}]} {
$zz disconnect
displayError "Cannot connect to target" $host
return 0
$zz disconnect
return 0
}
- if {[catch {zwait sessionWait 60}]} {
+ if {[catch {egw_wait sessionWait 60}]} {
displayError "Cannot initialize target" $host
$zz disconnect
return 0
$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
set sessionWait 0
$zz.$setNo search $query
- if {[catch {zwait sessionWait 600}]} {
- wlog debug "timeout/cancel in search"
+ if {[catch {egw_wait sessionWait 600}]} {
+ egw_log debug "timeout/cancel in search"
displayError "Timeout in search" {}
html "</body></html>\n"
$zz disconnect
global zstatus
global zleft
- wlog debug "init-m-response"
+ egw_log debug "init-m-response"
set zstatus($i) 1
incr zleft -1
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
global zstatus
global zleft
- wlog debug "fail-m-response"
+ egw_log debug "fail-m-response"
set zstatus($i) -1
incr zleft -1
}
}
}
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 10}]} {
break
}
}
z39$i.$setNo mediumSetPresentNumber 0
}
set zstatus($i) 1
- wlog debug "search " $hist($setNo,$i,query)
+ egw_log debug "search " $hist($setNo,$i,query)
z39$i.$setNo search $hist($setNo,$i,query)
incr zleft
} else {
}
}
while {$zleft > 0} {
- wlog debug "Waiting for search response"
- if {[catch {zwait zleft 30}]} {
+ egw_log debug "Waiting for search response"
+ if {[catch {egw_wait zleft 30}]} {
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
}
display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $tno
set setOffset [expr $got + $setOffset]
set toGet [expr 1 + $setMax - $setOffset]
- wflush
+ egw_flush
}
}