X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=4d3d3656d64c920e3e596a6717960614f27ee368;hb=6c6f3deb01675917b3c73cca50dd20d738593a47;hp=8f816bef125a779445d071e64038c52531238a59;hpb=6315a552d51ac08b60d25d8500da5574a83ba530;p=egate.git diff --git a/www/query.egw b/www/query.egw index 8f816be..4d3d365 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.10 1995/11/08 12:42:17 adam Exp $ +# $Id: query.egw,v 1.16 1995/11/13 18:17:47 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -26,15 +26,14 @@ proc ok-response {} { set host [lindex $sessionParms 0] - if {[info exists setNo]} { - set oldHost $hist($setNo,host) - } else { - set oldHost "" - } if {[catch {set setNo $nextSetNo}]} { set nextSetNo 1 set setNo 1 } + if {[catch {set oldHost [z39 connect]}]} { + set oldHost "" + } + set hist($setNo,host) $host set hist($setNo,idAuthentication) [lindex $targets($host) 3] @@ -51,34 +50,60 @@ proc ok-response {} { set sessionWait 0 if {[catch {z39 connect $host}]} { - html "Cannot connect to target ${host}
\n" + displayError "Cannot connect to target ${host}" {} html "\n" + z39 disconnect wabort } elseif {$sessionWait == 0} { - zwait sessionWait + if {[catch {zwait sessionWait 30}]} { + displayError "Cannot connect to target ${host}" {} + html "\n" + z39 disconnect + wabort + } if {$sessionWait != 1} { - html "Cannot connect to target ${host}
\n" + displayError "Cannot connect to target ${host}" {} html "\n" + z39 disconnect wabort } } set sessionWait 0 z39 idAuthentication $hist($setNo,idAuthentication) if {[catch {z39 init}]} { - htmlr "Cannot initialize with target ${host}
" - htmlr "" + displayError "Cannot initialize target ${host}" {} + html "\n" wabort } - zwait sessionWait + if {[catch {zwait sessionWait 60}]} { + displayError "Cannot initialize target ${host}" {} + html "\n" + wabort + } if {$sessionWait != "1"} { - htmlr "Cannot initialize with target ${host}
" + displayError "Cannot initialize target ${host}" {} + htmlr "\n" + wabort + } + if {![z39 initResult]} { + displayError "Connection rejected by target ${host}" \ + [z39 userInformationField] + z39 disconnect htmlr "" wabort } } set databases [lindex $targets($host) 1] - html {

} \n set nodb [llength $databases] if {$nodb > 1} { @@ -90,7 +115,7 @@ proc ok-response {} { set i 0 foreach d $databases { html { } $d \n } else { html {" checked> } $d \n @@ -109,16 +134,30 @@ proc ok-response {} { set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { html {\n" - html {} \n + html {} \n if {$no < 3} { html {\n" } html "
\n" @@ -126,11 +165,20 @@ proc ok-response {} { }

Alternatively you can enter your query in - CCL here:
+ CCL here:

Various technical parameters:

-Max hits: +{ + html {Max hits: } +} Records are shown in:

This page is maintained by Peter Wad Hansen . @@ -150,7 +197,7 @@ and will continue to be so until the end of December 1995.

{ - html { New target } } {