X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fquery.egw;h=74ad296851e55ec8458970dee32f9af055eedf9c;hb=8bafbc608e1ffba9ee87f4856e586dffa57901b8;hp=b28bcef68b746ba145e47ab36006089f45f8a608;hpb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;p=egate.git diff --git a/www/query.egw b/www/query.egw index b28bcef..74ad296 100644 --- a/www/query.egw +++ b/www/query.egw @@ -1,13 +1,13 @@ - - WWW/Z39.50 Gateway Query Form - - { -# $Id: query.egw,v 1.30 1996/01/24 14:14:19 adam Exp $ +# $Id: query.egw,v 1.39 1996/03/14 11:50:47 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl + if {![info exists debug]} { + session-lost + egw_abort + } } proc fail-response {} { @@ -24,8 +24,10 @@ proc ok-response {} { global nextSetNo global hist - set host [lindex $sessionParms 0] - set initSet [lindex $sessionParms 1] + html { WWW/Z39.50 Gateway Query Form} + + set initSet [lindex $sessionParms 0] + set host [lindex $sessionParms 1] set scanLine [lindex $sessionParms 2] set scanTerm [lrange $sessionParms 3 end] @@ -33,80 +35,90 @@ proc ok-response {} { set nextSetNo 1 set setNo 1 } - if {[catch {set oldHost [z39 connect]}]} { + if {[catch {set oldHost [z390 connect]}]} { set oldHost "" } - set hist($setNo,host) $host - set hist($setNo,idAuthentication) [lindex $targets($host) 3] + set hist($setNo,0,host) $host + set hist($setNo,0,idAuthentication) [lindex $targets($host) 3] - if {[catch {z39 failback fail-response}]} { - ir z39 - } + mkAssoc z390 $host - html "

Search in " [lindex $targets($host) 0] "


\n" - z39 callback ok-response - z39 failback fail-response - if {$host != $oldHost} { - catch {z39 disconnect} + z390 callback ok-response + z390 failback fail-response + set thisHost [splitHostSpec $host] + if {[string compare $thisHost $oldHost]} { + catch {z390 disconnect} set sessionWait 0 - if {[catch {z39 connect $host}]} { - displayError "Cannot connect to target ${host}" {} + if {[catch {z390 connect $thisHost}]} { + displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect + z390 disconnect egw_abort } elseif {$sessionWait == 0} { if {[catch {egw_wait sessionWait 35}]} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect + z390 disconnect egw_abort } if {$sessionWait != 1} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect + z390 disconnect egw_abort } } set sessionWait 0 - z39 idAuthentication $hist($setNo,idAuthentication) - if {[catch {z39 init}]} { - displayError "Cannot initialize target ${host}" {} + z390 idAuthentication $hist($setNo,0,idAuthentication) + if {[catch {z390 init}]} { + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } - if {[catch {egw_wait sessionWait 60}]} { - displayError "Cannot initialize target ${host}" {} + if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} { + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {$sessionWait != "1"} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } - if {![z39 initResult]} { - displayError "Connection rejected by target ${host}" \ - [z39 userInformationField] - z39 disconnect + if {![z390 initResult]} { + displayError "Connection rejected by target ${thisHost}" \ + [z390 userInformationField] + z390 disconnect html "\n" egw_abort } } - set databases [lindex $targets($host) 1] - if {$initSet == ""} { + set useIcons 1 + button-main + button-new-target + if {[lsearch [z390 options] scan] >= 0} { + button-scan-window $setNo + } + button-view-history + + html "

" [lindex $targets($host) 0] "


\n" + + html [lindex $targets($host) 4] "
\n" + + set databases [splitDatabaseSpec $host] + if {$initSet == -1} { set databaseDefault [lindex $databases 0] set oSetNo 0 } else { set oSetNo $initSet - set databaseDefault $hist($oSetNo,database) + set databaseDefault $hist($oSetNo,0,database) } html {
} \n + html / $sessionId {/search.egw/} $setNo + 0 {" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -129,7 +141,7 @@ proc ok-response {} { html [concat $databases] {"> All
} \n } } - html "Input your search criteria:
\n" + html "Fill-in this search form:
\n" set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { html {} + html { size=35> } + if {0 && [lsearch [z390 options] scan] >= 0} { + html {} } if {$no < 3} { html {