X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=a8db8ff559bc3761285cb6a81fed47656096cc37;hb=3b5ea708cd1a08f4ca78f256bc508086967ec58d;hp=e922e297507073e831d16a3d3cc93d438010575f;hpb=c6ea088406ba64e6ed5ea833e1c2ae516552e18e;p=egate.git diff --git a/www/query.egw b/www/query.egw index e922e29..a8db8ff 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.19 1995/12/20 16:31:31 adam Exp $ +# $Id: query.egw,v 1.28 1996/01/12 13:08:28 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,9 +44,7 @@ proc ok-response {} { ir z39 } - html {

} - 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} { @@ -56,7 +57,7 @@ proc ok-response {} { z39 disconnect wabort } elseif {$sessionWait == 0} { - if {[catch {zwait sessionWait 30}]} { + if {[catch {zwait sessionWait 35}]} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect @@ -96,16 +97,16 @@ proc ok-response {} { } 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 { + if {$initSet == ""} { set databaseDefault [lindex $databases 0] set oSetNo 0 + } else { + 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} { @@ -129,42 +130,58 @@ proc ok-response {} { } 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 {} + } + html "
\n" if {$no < 3} { - html {} \n + set template {} if {$oSetNo > 0} { - html "

{ - html {} - html {} -} + 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" @@ -206,6 +223,9 @@ and will continue to be so until the end of December 1995. html "databases: " $databases "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" + html "initSet: " $initSet "
\n" + html "scanLine: " $scanLine "
\n" + html "scanTerm: " $scanTerm "
\n" }