X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=cd40d6933fd41687aa48842caeae5899a22ab773;hb=7f332a840baf336e34d612cdee0ef27901f0dd11;hp=618955e84af7e51263290970e23f815f278f6696;hpb=6ceeaa167e3ef2970b6ef0ce2b6c7d9c362eda0a;p=egate.git
diff --git a/www/query.egw b/www/query.egw
index 618955e..cd40d69 100644
--- a/www/query.egw
+++ b/www/query.egw
@@ -1,13 +1,13 @@
-
- WWW/Z39.50 Gateway Query Form
-
-
{
-# $Id: query.egw,v 1.23 1996/01/03 08:59:41 adam Exp $
+# $Id: query.egw,v 1.41 2001/02/26 14:32:36 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
+ if {![info exists debug]} {
+ session-lost
+ egw_abort
+ }
}
proc fail-response {} {
@@ -24,97 +24,102 @@ proc ok-response {} {
global nextSetNo
global hist
- set host [lindex $sessionParms 0]
- set initSet [lindex $sessionParms 1]
+ html { WWW/Z39.50 Gateway Query Form}
+
+ set initSet [lindex $sessionParms 0]
+ set host [lindex $sessionParms 1]
set scanLine [lindex $sessionParms 2]
- set scanTerm [lindex $sessionParms 3]
+ set scanTerm [lrange $sessionParms 3 end]
if {[catch {set setNo $nextSetNo}]} {
set nextSetNo 1
set setNo 1
}
- if {[catch {set oldHost [z39 connect]}]} {
+ if {[catch {set oldHost [z390 connect]}]} {
set oldHost ""
}
- set hist($setNo,host) $host
- set hist($setNo,idAuthentication) [lindex $targets($host) 3]
-
- if {[catch {z39 failback fail-response}]} {
- ir z39
- }
+ set hist($setNo,0,host) $host
+ set hist($setNo,0,idAuthentication) [lindex $targets($host) 3]
- html "Search in " [lindex $targets($host) 0] "
\n"
+ mkAssoc z390 $host
- z39 callback ok-response
- z39 failback fail-response
- if {$host != $oldHost} {
- catch {z39 disconnect}
+ z390 callback ok-response
+ z390 failback fail-response
+ set thisHost [splitHostSpec $host]
+ if {[string compare $thisHost $oldHost]} {
+ catch {z390 disconnect}
set sessionWait 0
- if {[catch {z39 connect $host}]} {
- displayError "Cannot connect to target ${host}" {}
+ if {[catch {z390 connect $thisHost}]} {
+ displayError "Cannot connect to target ${thisHost}" {}
html "\n"
- z39 disconnect
- wabort
+ z390 disconnect
+ egw_abort
} elseif {$sessionWait == 0} {
- if {[catch {zwait sessionWait 35}]} {
- displayError "Cannot connect to target ${host}" {}
+ if {[catch {egw_wait sessionWait 35}]} {
+ displayError "Cannot connect to target ${thisHost}" {}
html "