X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=4d3d3656d64c920e3e596a6717960614f27ee368;hb=5bbe4c302d2d105aea7806317e9f31d5773a9536;hp=845015451a0a6bb2f00ca4294406c4daf777dfc8;hpb=cbf0ef7549f996f4d96f41c6dafa76dc17dd7782;p=egate.git diff --git a/www/query.egw b/www/query.egw index 8450154..4d3d365 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,12 @@ { -# $Id: query.egw,v 1.6 1995/10/31 16:56:23 adam Exp $ +# $Id: query.egw,v 1.16 1995/11/13 18:17:47 adam Exp $ + + if {[info commands saveState] == ""} { + source z39util.tcl + } + proc fail-response {} { global sessionWait set sessionWait -1 @@ -15,88 +20,165 @@ proc ok-response {} { set sessionWait 1 } - global host - set host $sessionParms - set databases [lindex $targets($host) 1] - catch {z39 disconnect} - set sessionWait 0 - ir z39 - z39 failback fail-response + global setNo + global nextSetNo + global hist + + set host [lindex $sessionParms 0] + + 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] + + if {[catch {z39 failback fail-response}]} { + ir z39 + } + + html "

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

\n" + z39 callback ok-response - if {[catch {z39 connect $host}]} { - htmlr "Cannot connect to target ${host}
" - htmlr "" - wabort - } elseif {$sessionWait == 0} { - zwait sessionWait - if {$sessionWait != 1} { - htmlr "Cannot connect to target ${host}
" + z39 failback fail-response + if {$host != $oldHost} { + catch {z39 disconnect} + + set sessionWait 0 + if {[catch {z39 connect $host}]} { + displayError "Cannot connect to target ${host}" {} + html "\n" + z39 disconnect + wabort + } elseif {$sessionWait == 0} { + if {[catch {zwait sessionWait 30}]} { + displayError "Cannot connect to target ${host}" {} + html "\n" + z39 disconnect + wabort + } + if {$sessionWait != 1} { + displayError "Cannot connect to target ${host}" {} + html "\n" + z39 disconnect + wabort + } + } + set sessionWait 0 + z39 idAuthentication $hist($setNo,idAuthentication) + if {[catch {z39 init}]} { + displayError "Cannot initialize target ${host}" {} + html "\n" + wabort + } + if {[catch {zwait sessionWait 60}]} { + displayError "Cannot initialize target ${host}" {} + html "\n" + wabort + } + if {$sessionWait != "1"} { + displayError "Cannot initialize target ${host}" {} + htmlr "\n" + wabort + } + if {![z39 initResult]} { + displayError "Connection rejected by target ${host}" \ + [z39 userInformationField] + z39 disconnect htmlr "" wabort } } - set sessionWait 0 - z39 init - zwait sessionWait - if {$sessionWait == -1} { - htmlr "Cannot initialize with target ${host}
" - 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 } - htmlr {

Search in databases

} - html {
} + + html {} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { - html {The chosen target supports searching in } - htmlr {several databases.
} - htmlr {Choose the bases you want to search:
} + html "The chosen target supports searching in " + html "several databases.
\n" + html "Choose the bases you want to search:
\n" } set i 0 foreach d $databases { html { } $d + if {[lsearch $databaseDefault $d] == -1} { + html {"> } $d \n } else { - htmlr {" checked> } $d + html {" checked> } $d \n } } - htmlr {
} + html "
\n" if {$nodb > 2} { html { All
} + html [concat $databases] {"> All
} \n } } }
-Input your search criteria:
+

Input your search criteria:


{ set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { - htmlr {} \n + if {$oSetNo > 0} { + html {
This page is maintained by Peter Wad Hansen . @@ -114,14 +195,25 @@ 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.
-sessionId: {html $sessionId}
-sessionParms: {html $sessionParms}
+ +{ + html { New target } +} { + html "
\n" + html "

Debug information

\n" + html "sessionId: $sessionId
\n" + html "sessionParms: $sessionParms
\n" foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} { - htmlr $e {: } $env($e) {
} + html $e {: } $env($e) {
} \n } + html "form: " [wform] "
\n" + html "target: " $host "
\n" + html "databases: " $databases "
\n" + html "setNo: " $setNo "
\n" + html "nextSetNo: " $nextSetNo "
\n" } -form: {html [wform]}
-target: {html $host}
-databases: {html $databases}
+ +