X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=0c4832d4ce52cbcc0fc6457fe35542ff68176e40;hb=df7b985601de6c729147a6fd6588adba6f905480;hp=8f816bef125a779445d071e64038c52531238a59;hpb=6315a552d51ac08b60d25d8500da5574a83ba530;p=egate.git diff --git a/www/query.egw b/www/query.egw index 8f816be..0c4832d 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.21 1996/01/02 10:52:26 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] @@ -42,7 +41,7 @@ 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 @@ -51,34 +50,59 @@ 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 35}]} { + 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 +114,7 @@ proc ok-response {} { set i 0 foreach d $databases { html { } $d \n } else { html {" checked> } $d \n @@ -98,62 +122,78 @@ proc ok-response {} { } html "
\n" if {$nodb > 2} { - html { All
} \n } + html "Input your search criteria:
\n" } } -
-

Input your search criteria:


{ 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" } } -

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


-

Various technical parameters:


-Max hits: -Records are shown in: - + + + +
-

- +{ + html {Number of records to display in the result set list: } + html {} +}

+

+ +{ + html {Europagate} + html {New Target} +} +


This page is maintained by Peter Wad Hansen . Last modified 29. september 1995.
This and the following pages are under construction and will continue to be so until the end of December 1995. -
{ - html { New target } -} -{ html "
\n" html "

Debug information

\n" html "sessionId: $sessionId
\n"