From ebeb5e591b8f1bf6c5045efaddf74f3eee7bdbaf Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 24 Jan 1996 08:27:23 +0000 Subject: [PATCH 1/1] Modified to use egw_-commands. --- www/history.egw | 4 ++-- www/mquery.egw | 8 ++++---- www/msearch.egw | 8 ++++---- www/query.egw | 28 ++++++++++++++-------------- www/search.egw | 50 +++++++++++++++++++++++++------------------------- www/z39util.tcl | 54 +++++++++++++++++++++++++++--------------------------- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/www/history.egw b/www/history.egw index a099c3b..f3d0bdf 100644 --- a/www/history.egw +++ b/www/history.egw @@ -4,7 +4,7 @@ { -# $Id: history.egw,v 1.3 1996/01/12 10:03:16 adam Exp $ +# $Id: history.egw,v 1.4 1996/01/24 08:27:25 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -36,7 +36,7 @@ foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} { html $e {: } $env($e) {
} \n } - html "form: " [wform] "
\n" + html "form: " [egw_form] "
\n" } diff --git a/www/mquery.egw b/www/mquery.egw index c205519..4fc8f45 100644 --- a/www/mquery.egw +++ b/www/mquery.egw @@ -4,7 +4,7 @@ { -# $Id: mquery.egw,v 1.9 1996/01/09 16:16:47 adam Exp $ +# $Id: mquery.egw,v 1.10 1996/01/24 08:27:25 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -25,7 +25,7 @@ set phost {} set i 0 - foreach t [lsort [wform target]] { + foreach t [lsort [egw_form target]] { set host [lindex $t 0] set base [lindex $t 1] if {$host != $phost} { @@ -38,7 +38,7 @@ } if {$i == 0} { html "

No targets specified

" - wabort 1 + egw_abort 1 } set hist($setNo,0,host) $i } @@ -99,7 +99,7 @@ html "host=" $hist($setNo,$i,host) " " $hist($setNo,$i,database) html "
\n" } - html "form: " [wform] "
\n" + html "form: " [egw_form] "
\n" html "target: " $host "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" diff --git a/www/msearch.egw b/www/msearch.egw index 5c4f410..08f5ea6 100644 --- a/www/msearch.egw +++ b/www/msearch.egw @@ -1,6 +1,6 @@ { -# $Id: msearch.egw,v 1.11 1996/01/09 16:16:48 adam Exp $ +# $Id: msearch.egw,v 1.12 1996/01/24 08:27:26 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -15,7 +15,7 @@ html "\n" set setNo [lindex $sessionParms 0] - if {[wform menu1] != ""} { + if {[egw_form menu1] != ""} { set hist($nextSetNo,0,host) $hist($setNo,0,host) for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} { set hist($nextSetNo,$i,host) $hist($setNo,$i,host) @@ -29,7 +29,7 @@ for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} { set hist($setNo,$i,query) [build-query $hist($setNo,$i,host) 3] } - set hist($setNo,maxPresent) [wform hits] + set hist($setNo,maxPresent) [egw_form hits] if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } @@ -91,7 +91,7 @@ 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 "query: --" $hist($setNo,1,query) "--
\n" html "database: " $hist($setNo,1,database) "
\n" diff --git a/www/query.egw b/www/query.egw index a8db8ff..698c861 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.28 1996/01/12 13:08:28 adam Exp $ +# $Id: query.egw,v 1.29 1996/01/24 08:27:28 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -44,7 +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} { @@ -55,19 +55,19 @@ proc ok-response {} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect - wabort + egw_abort } elseif {$sessionWait == 0} { - if {[catch {zwait sessionWait 35}]} { + if {[catch {egw_wait sessionWait 35}]} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect - wabort + egw_abort } if {$sessionWait != 1} { displayError "Cannot connect to target ${host}" {} html "\n" z39 disconnect - wabort + egw_abort } } set sessionWait 0 @@ -75,24 +75,24 @@ proc ok-response {} { if {[catch {z39 init}]} { displayError "Cannot initialize target ${host}" {} html "\n" - wabort + egw_abort } - if {[catch {zwait sessionWait 60}]} { + if {[catch {egw_wait sessionWait 60}]} { displayError "Cannot initialize target ${host}" {} html "\n" - wabort + egw_abort } if {$sessionWait != "1"} { displayError "Cannot initialize target ${host}" {} - htmlr "\n" - wabort + html "\n" + egw_abort } if {![z39 initResult]} { displayError "Connection rejected by target ${host}" \ [z39 userInformationField] z39 disconnect - htmlr "" - wabort + html "\n" + egw_abort } } set databases [lindex $targets($host) 1] @@ -218,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" diff --git a/www/search.egw b/www/search.egw index d6d8717..588f13a 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.29 1996/01/12 13:39:22 adam Exp $ +# $Id: search.egw,v 1.30 1996/01/24 08:27:29 adam Exp $ proc start-scan {scanNo cache dir initSet} { global sessionId @@ -78,7 +78,7 @@ proc start-scan {scanNo cache dir initSet} { if {$hist($setNo,$scanNo,scanTerm) == ""} { button-new-query 0 $setNo - wabort + egw_abort return } if {$dir == "b"} { @@ -149,10 +149,10 @@ proc start-scan {scanNo cache dir initSet} { 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: " $hist($setNo,database) "
\n" - html "selected: " [wform base] "
\n" + html "selected: " [egw_form base] "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" } @@ -205,7 +205,7 @@ proc buttons {setNo setMax startPos after} { set setNo [lindex $sessionParms 0] - if {[wform] != ""} { + if {[egw_form] != ""} { set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) set hist($nextSetNo,host) $hist($setNo,host) @@ -217,37 +217,37 @@ proc buttons {setNo setMax startPos after} { } set hist($setNo,scan) 0 - set hist($setNo,form,menu1) [wform menu1] - set hist($setNo,form,menu2) [wform menu2] - set hist($setNo,form,menu3) [wform menu3] + set hist($setNo,form,menu1) [egw_form menu1] + set hist($setNo,form,menu2) [egw_form menu2] + set hist($setNo,form,menu3) [egw_form menu3] - set hist($setNo,form,entry1) [wform entry1] - set hist($setNo,form,entry2) [wform entry2] - set hist($setNo,form,entry3) [wform entry3] + set hist($setNo,form,entry1) [egw_form entry1] + set hist($setNo,form,entry2) [egw_form entry2] + set hist($setNo,form,entry3) [egw_form entry3] - set hist($setNo,form,logic1) [wform logic1] - set hist($setNo,form,logic2) [wform logic2] + set hist($setNo,form,logic1) [egw_form logic1] + set hist($setNo,form,logic2) [egw_form logic2] set hist($setNo,form,logic3) {} set host $hist($setNo,host) set databases [lindex $targets($host) 1] - set b [wform base] - if {[wform baseall] != ""} { + set b [egw_form base] + if {[egw_form baseall] != ""} { set hist($setNo,database) $databases } elseif {$b == ""} { set hist($setNo,database) $databases } else { set hist($setNo,database) $b } - set hist($setNo,maxPresent) [wform hits] + set hist($setNo,maxPresent) [egw_form hits] if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } set i [lindex $sessionParms 1] if {$i == ""} { for {set j 1} {$j <= 3} {incr j} { - if {[wform scan$j] != ""} { + if {[egw_form scan$j] != ""} { set i $j break } @@ -261,7 +261,7 @@ proc buttons {setNo setMax startPos after} { set hist($setNo,scanAttr) [lindex $termPlusAttr 1] start-scan $scanNo 0 {} {} html "\n" - wabort + egw_abort return } set query [build-query $hist($setNo,host) 3] @@ -270,7 +270,7 @@ proc buttons {setNo setMax startPos after} { displayError "Empty query" \ "You must specify at least one search word" html "\n" - wabort + egw_abort } set hist($setNo,query) $query } else { @@ -279,7 +279,7 @@ proc buttons {setNo setMax startPos after} { set hist($setNo,$scanNo,scanTerm) {} start-scan $scanNo 0 {} {} html "\n" - wabort + egw_abort } if {![info exists hist($setNo,scan)]} return if {$hist($setNo,scan) > 0} { @@ -290,7 +290,7 @@ proc buttons {setNo setMax startPos after} { } start-scan $scanNo 1 $dir $setNo html "\n" - wabort + egw_abort } } set host $hist($setNo,host) @@ -313,7 +313,7 @@ proc buttons {setNo setMax startPos after} { } else { html "

No hits

\n" } - wflush + egw_flush html "