X-Git-Url: http://git.indexdata.com/?p=egate.git;a=blobdiff_plain;f=www%2Fquery.egw;h=d2280abb6e57f6a1a2a809cf3564d6aee7526993;hp=0c4832d4ce52cbcc0fc6457fe35542ff68176e40;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hpb=df7b985601de6c729147a6fd6588adba6f905480 diff --git a/www/query.egw b/www/query.egw index 0c4832d..d2280ab 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.21 1996/01/02 10:52:26 adam Exp $ +# $Id: query.egw,v 1.35 1996/03/07 12:46:08 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -25,85 +25,99 @@ proc ok-response {} { global hist set host [lindex $sessionParms 0] + set initSet [lindex $sessionParms 1] + set scanLine [lindex $sessionParms 2] + set scanTerm [lrange $sessionParms 3 end] if {[catch {set setNo $nextSetNo}]} { set nextSetNo 1 set setNo 1 } - if {[catch {set oldHost [z39 connect]}]} { + if {[catch {set oldHost [z390 connect]}]} { set oldHost "" } - set hist($setNo,host) $host - set hist($setNo,idAuthentication) [lindex $targets($host) 3] + set hist($setNo,0,host) $host + set hist($setNo,0,idAuthentication) [lindex $targets($host) 3] - if {[catch {z39 failback fail-response}]} { - ir z39 - } - - html "

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

\n" + mkAssoc z390 $host - z39 callback ok-response - z39 failback fail-response - if {$host != $oldHost} { - catch {z39 disconnect} + z390 callback ok-response + z390 failback fail-response + set thisHost [splitHostSpec $host] + if {[string compare $thisHost $oldHost]} { + catch {z390 disconnect} set sessionWait 0 - if {[catch {z39 connect $host}]} { - displayError "Cannot connect to target ${host}" {} + if {[catch {z390 connect $thisHost}]} { + displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect - wabort + z390 disconnect + 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 + z390 disconnect + egw_abort } if {$sessionWait != 1} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect - wabort + z390 disconnect + egw_abort } } set sessionWait 0 - z39 idAuthentication $hist($setNo,idAuthentication) - if {[catch {z39 init}]} { - displayError "Cannot initialize target ${host}" {} + z390 idAuthentication $hist($setNo,0,idAuthentication) + if {[catch {z390 init}]} { + displayError "Cannot initialize target ${thisHost}" {} html "\n" - wabort + egw_abort } - if {[catch {zwait sessionWait 60}]} { - displayError "Cannot initialize target ${host}" {} + if {$sessionWait == 0 && [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}" \ - [z39 userInformationField] - z39 disconnect - htmlr "" - wabort + if {![z390 initResult]} { + displayError "Connection rejected by target ${thisHost}" \ + [z390 userInformationField] + z390 disconnect + html "\n" + egw_abort } } + + set useIcons 1 + button-europagate + button-new-target 1 + if {[lsearch [z390 options] scan] >= 0} { + button-scan-window 1 $setNo + } + button-view-history 0 + + html "

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

\n" + + html [lindex $targets($host) 4] "
\n" + set databases [lindex $targets($host) 1] - if {[catch {set prevHost $hist([expr $setNo - 1],host)}]} { + if {$initSet == ""} { set databaseDefault [lindex $databases 0] set oSetNo 0 } else { - set oSetNo [expr $setNo - 1] - set databaseDefault $hist($oSetNo,database) + set oSetNo $initSet + set databaseDefault $hist($oSetNo,0,database) } + html {

} \n + html / $sessionId {/search.egw/} $setNo + 0 {" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -125,36 +139,50 @@ 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 {\n" html {} \n + set template {} + if {$scanLine == $no} { + set template [join $scanTerm " "] + } elseif {[info exists hist($oSetNo,form,entry$no)]} { + set template [join $hist($oSetNo,form,entry$no) " "] + } + if {[string length $template] > 0} { + html { value="} $template {"} + } + html { size=43> } + if {0 && [lsearch [z390 options] scan] >= 0} { + html {} + } if {$no < 3} { html {\n" } @@ -163,7 +191,6 @@ proc ok-response {} { } -
{ @@ -174,26 +201,23 @@ proc ok-response {} { } else { html 20 } - html {" size=3>} -} -

- -{ - html {} - html {} + html {" size=4>} + html "\n" + html "

\n" + + set useIcons 0 + button-europagate + button-new-target 1 + if {[lsearch [z390 options] scan] >= 0} { + button-scan-window 1 $setNo + } + button-view-history 0 } -

-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. - { + catch maintenance + global debug + if {!$debug} return html "

\n" html "

Debug information

\n" html "sessionId: $sessionId
\n" @@ -201,12 +225,13 @@ and will continue to be so until the end of December 1995. foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} { html $e {: } $env($e) {
} \n } - html "form: " [wform] "
\n" + html "form: " [egw_form] "
\n" html "target: " $host "
\n" html "databases: " $databases "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" + html "initSet: " $initSet "
\n" + html "scanLine: " $scanLine "
\n" + html "scanTerm: " $scanTerm "
\n" } - -