#
-# $Id: z39util.tcl,v 1.3 1995/11/08 12:42:18 adam Exp $
+# $Id: z39util.tcl,v 1.5 1995/11/08 18:07:23 adam Exp $
#
proc saveState {} {
uplevel #0 {
if {$var == "f"} continue
if {$var == "sessionId"} continue
if {$var == "errorInfo"} continue
- set names [array names $var]
- if {$names != ""} {
+ if {[catch {set names [array names $var]}]} {
+ eval "set v \$${var}"
+ puts $f "set ${var} \{$v\}"
+ } else {
foreach n $names {
eval "set v \$${var}(\$n)"
puts $f "set ${var}($n) \{$v\}"
}
- } else {
- eval "set v \$${var}"
- puts $f "set ${var} \{$v\}"
+ catch {
+ eval "set v \$${var}"
+ puts $f "set ${var} \{$v\}"
+ }
}
}
close $f
set title [lindex [$zset getMarc $no field 245 * a] 0]
set year [lindex [$zset getMarc $no field 260 * c] 0]
} ] } {
- html {<a href="http://} $env(SERVER_NAME) $env(SCRIPT_NAME) /
+ html {<a href="http:} $env(SCRIPT_NAME) /
html $sessionId {/showfull.egw/} $setNo + $no {"> } $title {</a>}
html " <i> ${year} </i>"
}
html "Cannot initialize with target ${host} <br>\n"
return 0
}
- zwait sessionWait
+ if {[catch {zwait sessionWait 60}]} {
+ html "Cannot initialize with target ${host} <br>\n"
+ z39 disconnect
+ return 0
+ }
if {$sessionWait != "1"} {
html "Cannot initialize with target ${host} <br>\n"
+ z39 disconnect
return 0
}
}
set sessionWait 0
z39.$setNo search $hist($setNo,query)
- zwait sessionWait
+ if {[catch {zwait sessionWait 600}]} {
+ html "</body></html>\n"
+ z39 disconnect
+ return 0
+ }
+
if {$sessionWait != 1} {
html "</body></html>\n"
+ z39 disconnect
return 0
}
set status [z39.$setNo responseStatus]
if {$got < $toGet} {
set sessionWait 0
z39.$setNo present $setOffset $toGet
- zwait sessionWait
+ if {[catch {zwait sessionWait 300}]} {
+ z39 disconnect
+ break
+ }
if {$sessionWait != "1"} {
break
}
}
html "<hr><h3>History</h3><dl>\n"
for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
- html {<dt> <a href="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
+ html {<dt> <a href="http:} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + 1
html + [expr $hist($setNo,maxPresent) - 1]
html {"> } [lindex $targets($hist($setNo,host)) 0]
html "\n"
}
html "</dl>\n"
-}
\ No newline at end of file
+}