X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=b28bcef68b746ba145e47ab36006089f45f8a608;hb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;hp=0c4832d4ce52cbcc0fc6457fe35542ff68176e40;hpb=df7b985601de6c729147a6fd6588adba6f905480;p=egate.git diff --git a/www/query.egw b/www/query.egw index 0c4832d..b28bcef 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.30 1996/01/24 14:14:19 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -25,6 +25,9 @@ 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 @@ -41,8 +44,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 if {$host != $oldHost} { @@ -53,19 +55,19 @@ proc ok-response {} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect - wabort + egw_abort } elseif {$sessionWait == 0} { - if {[catch {zwait sessionWait 35}]} { + if {[catch {egw_wait sessionWait 35}]} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect - wabort + egw_abort } if {$sessionWait != 1} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect - wabort + egw_abort } } set sessionWait 0 @@ -73,37 +75,38 @@ proc ok-response {} { if {[catch {z39 init}]} { displayError "Cannot initialize target ${host}" {} html "\n" - wabort + egw_abort } - if {[catch {zwait sessionWait 60}]} { + if {[catch {egw_wait sessionWait 60}]} { displayError "Cannot initialize target ${host}" {} html "\n" - wabort + egw_abort } if {$sessionWait != "1"} { displayError "Cannot initialize target ${host}" {} - htmlr "\n" - wabort + html "\n" + egw_abort } if {![z39 initResult]} { displayError "Connection rejected by target ${host}" \ [z39 userInformationField] z39 disconnect - htmlr "" - wabort + html "\n" + egw_abort } } 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 oSetNo $initSet set databaseDefault $hist($oSetNo,database) } + html {
} \n + html / $sessionId {/search.egw/} $setNo {" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -125,36 +128,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=45> } + if {0 && [lsearch [z39 options] scan] >= 0} { + html {} + } if {$no < 3} { html {\n" } @@ -163,7 +180,6 @@ proc ok-response {} { } -
{ @@ -174,26 +190,26 @@ proc ok-response {} { } else { html 20 } - html {" size=3>} + html {" size=4>} }

{ - html {Europagate} - html {New Target} -} + button-europagate + + button-new-target 1 -

-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. + if {[lsearch [z39 options] scan] >= 0} { + button-scan-window 1 $setNo + } + button-view-history 0 +} { + catch maintenance + global debug + if {!$debug} return html "
\n" html "

Debug information

\n" html "sessionId: $sessionId
\n" @@ -201,11 +217,14 @@ 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" }