X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=588f13a4d6cc9585402281689f447ad3686428d3;hb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;hp=45589ac97cef816e49128b2a3296e1e90d920332;hpb=cc5af6a5323f9576c208519dbf4351b4f818e166;p=egate.git diff --git a/www/search.egw b/www/search.egw index 45589ac..588f13a 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.26 1996/01/09 16:16:48 adam Exp $ +# $Id: search.egw,v 1.30 1996/01/24 08:27:29 adam Exp $ -proc start-scan {scanNo cache dir} { +proc start-scan {scanNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -18,11 +18,67 @@ proc start-scan {scanNo cache dir} { html "
\n" + html "
\n" display-scan $setNo $scanNo 0 html "
\n"
@@ -94,10 +149,10 @@ proc start-scan {scanNo cache dir} {
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"
}
@@ -150,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)
@@ -162,56 +217,70 @@ 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
}
- for {set i 1} {$i <= 3} {incr i} {
- if {[wform scan$i] != ""} {
- set scanNo 1000
- set hist($setNo,scan) $i
- set termPlusAttr [build-scan $hist($setNo,host) $i]
- set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
- set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
- start-scan $scanNo 0 {}
- html "\n"
- wabort
- return
+ set i [lindex $sessionParms 1]
+ if {$i == ""} {
+ for {set j 1} {$j <= 3} {incr j} {
+ if {[egw_form scan$j] != ""} {
+ set i $j
+ break
+ }
}
}
+ if {$i != ""} {
+ set scanNo 1000
+ set hist($setNo,scan) $i
+ set termPlusAttr [build-scan $hist($setNo,host) $i]
+ set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
+ set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
+ start-scan $scanNo 0 {} {}
+ html "