X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=88b7cf286c8520ac80d948cb144592fc107da05a;hb=a6e5ecf2a6d6dedf266c5f9d6bc2447a528b199e;hp=19d74c80eedd7115c3b488a222a46eb5e560a127;hpb=93f1ce56fdda46fe894bed7aa1f1516a8d08957f;p=egate.git diff --git a/www/query.egw b/www/query.egw index 19d74c8..88b7cf2 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.13 1995/11/09 17:31:04 adam Exp $ +# $Id: query.egw,v 1.17 1995/11/14 16:01:50 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,18 +50,19 @@ 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} { if {[catch {zwait sessionWait 30}]} { - html "Cannot connect to target ${host}
\n" + 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 @@ -71,23 +71,38 @@ proc ok-response {} { 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 } if {[catch {zwait sessionWait 60}]} { - htmlr "Cannot initialize with target ${host}
" - htmlr "" + 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] + if {$setNo > 1 && $hist([expr $setNo - 1],host) == $host} { + set oSetNo [expr $setNo - 1] + set databaseDefault $hist($oSetNo,database) + } else { + set databaseDefault [lindex $databases 0] + set oSetNo 0 + } + html {

} \n set nodb [llength $databases] @@ -100,7 +115,7 @@ proc ok-response {} { set i 0 foreach d $databases { html { } $d \n } else { html {" checked> } $d \n @@ -108,7 +123,7 @@ proc ok-response {} { } html "
\n" if {$nodb > 2} { - html { All
} \n } } @@ -119,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" @@ -141,7 +170,15 @@ Alternatively you can enter your query in

Various technical parameters:

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