X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=www%2Fsearch.egw;h=eabe4b9344aa2b75185065f9c40d5636e6348149;hb=3871eda3b3a1518d4d18c1ffc0ed0375cb88bdf5;hp=edf07934948d2e686a9d07f7b697840bc7dc16c2;hpb=ba37ce207c47ac1fa27bb46df7dc54f72740bb96;p=egate.git diff --git a/www/search.egw b/www/search.egw index edf0793..eabe4b9 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.23 1996/01/03 15:19:41 adam Exp $ +# $Id: search.egw,v 1.32 1996/02/12 13:39:40 adam Exp $ -proc start-scan {scanNo cache dir} { +proc start-scan {scanNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -16,15 +16,13 @@ proc start-scan {scanNo cache dir} { set host $hist($setNo,host) - html "
\n" + html "
\n" display-scan $setNo $scanNo 0 html "
\n"
@@ -69,7 +132,7 @@ proc start-scan {scanNo cache dir} {
html {}
if {$useIcons} {
- html {}
} else {
html {Previous Terms | }
@@ -78,7 +141,7 @@ proc start-scan {scanNo cache dir} {
html {}
if {$useIcons} {
- html {}
} else {
html {Next Terms | }
@@ -94,10 +157,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"
}
@@ -110,24 +173,24 @@ proc buttons {setNo setMax startPos after} {
html "
\n" button-europagate - if {$setMax < [z39.$setNo resultCount]} { + if {$setMax > 0 && $setMax < [z39.$setNo resultCount]} { html {} } else { html {">Next Records} " | \n" } } - if {$startPos != "" && $startPos != "1"} { + if {$setMax > 0 && $startPos != "" && $startPos != "1"} { html {} } else { html {">Previous Records} " | \n" @@ -149,8 +212,10 @@ proc buttons {setNo setMax startPos after} { global hist set setNo [lindex $sessionParms 0] + set startPos [lindex $sessionParms 1] + set endPos [lindex $sessionParms 2] - if {[wform] != ""} { + if {[egw_form] != ""} { set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) set hist($nextSetNo,host) $hist($setNo,host) @@ -162,91 +227,132 @@ 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 {} $setNo + html "