X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=92e2e1d7aa4c77d49eb23e29a5cd1280c7f3ab98;hb=ebbedbe0d49ac7cae8d511bf051eed59d9e14e50;hp=e922e297507073e831d16a3d3cc93d438010575f;hpb=c6ea088406ba64e6ed5ea833e1c2ae516552e18e;p=egate.git diff --git a/www/query.egw b/www/query.egw index e922e29..92e2e1d 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.25 1996/01/04 10:40:00 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,14 +97,21 @@ 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 {[catch {set prevHost $hist([expr $setNo - 1],host)}]} { +# set databaseDefault [lindex $databases 0] +# set oSetNo 0 +# } else { +# set oSetNo [expr $setNo - 1] +# set databaseDefault $hist($oSetNo,database) +# } + if {$initSet == ""} { set databaseDefault [lindex $databases 0] set oSetNo 0 + } else { + set oSetNo $initSet + set databaseDefault $hist($oSetNo,database) } - + html {
} \n set nodb [llength $databases] @@ -129,8 +137,6 @@ 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 + if {$scanLine == $no} { + html { value="} [join $scanTerm " "] {"} + } elseif {[info exists hist($oSetNo,form,entry$no)]} { + html { value="} [join $hist($oSetNo,form,entry$no) " "] {"} + } + html { size=35> } + if {[lsearch [z39 options] scan] >= 0} { + html {} + } if {$no < 3} { html {\n" } @@ -164,7 +178,8 @@ proc ok-response {} { } } - + +
{ html {Number of records to display in the result set list: } @@ -174,26 +189,22 @@ proc ok-response {} { } else { html 20 } - html {" size=3>} + html {" size=4>} } -
-

+

{ - html {} - html {} -} + button-europagate -

-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. + button-new-target 1 + button-view-history 0 +} { + catch maintenance + global debug + if {!$debug} return html "
\n" html "

Debug information

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