X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=632f35ed8496f6a3241f800429c59f241e5ec6a1;hb=84081f9782ee28f9236b0974891f1d6b865992be;hp=cad8e7a3e527c2fd5120b664d6099113bbc6c19f;hpb=fff045d159e76bb8bb856fd7d2e6d34c1498d5a5;p=egate.git diff --git a/www/query.egw b/www/query.egw index cad8e7a..632f35e 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.27 1996/01/12 10:03:17 adam Exp $ +# $Id: query.egw,v 1.31 1996/01/24 16:59:28 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -44,55 +44,56 @@ proc ok-response {} { ir z39 } - html "

Search in " [lindex $targets($host) 0] "

\n" + html "

Search in " [lindex $targets($host) 0] "


\n" z39 callback ok-response z39 failback fail-response - if {$host != $oldHost} { + set thisHost [splitHostSpec $host] + if {$thisHost != $oldHost} { catch {z39 disconnect} set sessionWait 0 - if {[catch {z39 connect $host}]} { - displayError "Cannot connect to target ${host}" {} + if {[catch {z39 connect $thisHost}]} { + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect - wabort + 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 "\n" z39 disconnect - wabort + egw_abort } if {$sessionWait != 1} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect - wabort + egw_abort } } set sessionWait 0 z39 idAuthentication $hist($setNo,idAuthentication) if {[catch {z39 init}]} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" - wabort + egw_abort } - if {[catch {zwait sessionWait 60}]} { - displayError "Cannot initialize target ${host}" {} + if {[catch {egw_wait sessionWait 60}]} { + displayError "Cannot initialize target ${thisHost}" {} html "\n" - wabort + egw_abort } if {$sessionWait != "1"} { - displayError "Cannot initialize target ${host}" {} - htmlr "\n" - wabort + displayError "Cannot initialize target ${thisHost}" {} + html "\n" + egw_abort } if {![z39 initResult]} { - displayError "Connection rejected by target ${host}" \ + displayError "Connection rejected by target ${thisHost}" \ [z39 userInformationField] z39 disconnect - htmlr "" - wabort + html "\n" + egw_abort } } set databases [lindex $targets($host) 1] @@ -128,8 +129,8 @@ proc ok-response {} { html { All
} \n } - html "Input your search criteria:
\n" } + html "Input your search criteria:
\n" set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { html {} } - html "
\n" if {$no < 3} { html {