X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=92e2e1d7aa4c77d49eb23e29a5cd1280c7f3ab98;hb=3a8f973d3eae6f61c31340874c84610fd3a7f8e5;hp=e2f94686d5dcaf75c01ec39a6a2e2c62deafead9;hpb=b443634fbd412cea15ea527188c3e241bb1edf21;p=egate.git diff --git a/www/query.egw b/www/query.egw index e2f9468..92e2e1d 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.11 1995/11/08 16:14:33 adam Exp $ +# $Id: query.egw,v 1.25 1996/01/04 10:40:00 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -25,16 +25,18 @@ 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 {[info exists setNo]} { - set oldHost $hist($setNo,host) - } else { - set oldHost "" - } 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] @@ -42,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} { @@ -51,18 +52,19 @@ proc ok-response {} { set sessionWait 0 if {[catch {z39 connect $host}]} { - html "Cannot connect to target ${host}
\n" + displayError "Cannot connect to target ${host}" {} html "\n" + z39 disconnect wabort } elseif {$sessionWait == 0} { - if {[catch {zwait sessionWait 30}]} { - html "Cannot connect to target ${host}
\n" + if {[catch {zwait sessionWait 35}]} { + displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect wabort } if {$sessionWait != 1} { - html "Cannot connect to target ${host}
\n" + displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect wabort @@ -71,23 +73,45 @@ proc ok-response {} { set sessionWait 0 z39 idAuthentication $hist($setNo,idAuthentication) if {[catch {z39 init}]} { - htmlr "Cannot initialize with target ${host}
" - htmlr "" + displayError "Cannot initialize target ${host}" {} + html "\n" wabort } if {[catch {zwait sessionWait 60}]} { - htmlr "Cannot initialize with target ${host}
" - htmlr "" + displayError "Cannot initialize target ${host}" {} + html "\n" wabort } if {$sessionWait != "1"} { - htmlr "Cannot initialize with target ${host}
" + displayError "Cannot initialize target ${host}" {} + htmlr "\n" + wabort + } + if {![z39 initResult]} { + displayError "Connection rejected by target ${host}" \ + [z39 userInformationField] + z39 disconnect htmlr "" wabort } } set databases [lindex $targets($host) 1] +# 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] @@ -100,7 +124,7 @@ proc ok-response {} { set i 0 foreach d $databases { html { } $d \n } else { html {" checked> } $d \n @@ -108,62 +132,79 @@ proc ok-response {} { } html "
\n" if {$nodb > 2} { - html { All
} \n } + html "Input your search criteria:
\n" } -} -
-

Input your search criteria:


-{ set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { html {\n" - html {} \n + html { } + if {[lsearch [z39 options] scan] >= 0} { + html {} + } if {$no < 3} { html {\n" } html "
\n" } } -

-Alternatively you can enter your query in - CCL here:
-
-

-

Various technical parameters:


-Max hits: -Records are shown in: - + + +
-

- +{ + html {Number of records to display in the result set list: } + html {} +}

-
-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. -
+

{ - html { New target } + button-europagate + + 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" @@ -176,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" }