X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=632f35ed8496f6a3241f800429c59f241e5ec6a1;hb=84081f9782ee28f9236b0974891f1d6b865992be;hp=92e2e1d7aa4c77d49eb23e29a5cd1280c7f3ab98;hpb=3a8f973d3eae6f61c31340874c84610fd3a7f8e5;p=egate.git diff --git a/www/query.egw b/www/query.egw index 92e2e1d..632f35e 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.25 1996/01/04 10:40:00 adam Exp $ +# $Id: query.egw,v 1.31 1996/01/24 16:59:28 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -44,66 +44,60 @@ 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} { + set thisHost [splitHostSpec $host] + if {$thisHost != $oldHost} { catch {z39 disconnect} set sessionWait 0 - if {[catch {z39 connect $host}]} { - displayError "Cannot connect to target ${host}" {} + if {[catch {z39 connect $thisHost}]} { + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect - wabort + 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 + egw_abort } if {$sessionWait != 1} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect - wabort + egw_abort } } set sessionWait 0 z39 idAuthentication $hist($setNo,idAuthentication) if {[catch {z39 init}]} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" - wabort + egw_abort } - if {[catch {zwait sessionWait 60}]} { - displayError "Cannot initialize target ${host}" {} + if {[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}" \ + displayError "Connection rejected by target ${thisHost}" \ [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)}]} { -# 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 @@ -113,7 +107,7 @@ proc ok-response {} { } html {

} \n + html / $sessionId {/search.egw/} $setNo {" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -135,41 +129,49 @@ 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 { } - if {[lsearch [z39 options] scan] >= 0} { + if {[string length $template] > 0} { + html { value="} $template {"} + } + html { size=43> } + if {0 && [lsearch [z39 options] scan] >= 0} { html {} } if {$no < 3} { html {\n" @@ -198,6 +200,10 @@ proc ok-response {} { button-europagate button-new-target 1 + + if {[lsearch [z39 options] scan] >= 0} { + button-scan-window 1 $setNo + } button-view-history 0 } @@ -212,7 +218,7 @@ proc ok-response {} { 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"