X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=eabe4b9344aa2b75185065f9c40d5636e6348149;hb=3871eda3b3a1518d4d18c1ffc0ed0375cb88bdf5;hp=daaf3b7fb70e32b74e0b4e700bfb6bb58e4fdeb5;hpb=6ceeaa167e3ef2970b6ef0ce2b6c7d9c362eda0a;p=egate.git diff --git a/www/search.egw b/www/search.egw index daaf3b7..eabe4b9 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.22 1996/01/03 08:59:43 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 @@ -11,19 +11,18 @@ proc start-scan {scanNo cache dir} { global targets global nextSetNo global env + global useIcons + global debug set host $hist($setNo,host) - html "
\n" display-scan $setNo $scanNo 0 + html "
\n"
+
+ button-europagate
html {Backward} "\n"
+ html / $sessionId {/search.egw/} $setNo + [expr $scanNo - 1] + b {">}
+ if {$useIcons} {
+ html {}
+ } else {
+ html {Previous Terms | }
+ }
html {Forward
}
+ html / $sessionId {/search.egw/} $setNo + [expr $scanNo + 1] + f {">}
+ if {$useIcons} {
+ html {}
+ } else {
+ html {Next Terms | }
+ }
+ html {}
+ button-new-query 0 $setNo
+ if {!$debug} return
html "
\n" - html "
\n" - if {$useIcons} { - html {} - } - if {$setMax < [z39.$setNo resultCount]} { + button-europagate + 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" } } - html {} - } else { - html {">New Query} " | \n" - } + button-new-query 1 $setNo + button-new-target 1 + button-view-history 0 - html {} - } else { - html {">New Target} - } html "
\n" - if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} { - html "
\n" - } - } if {[info commands saveState] == ""} { @@ -154,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) @@ -165,88 +225,134 @@ proc buttons {setNo setMax startPos after} { } else { catch {unset hist($setNo,hits)} } - set hist($setNo,form,menu1) [wform menu1] - set hist($setNo,form,menu2) [wform menu2] - set hist($setNo,form,menu3) [wform menu3] + set hist($setNo,scan) 0 - 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,menu1) [egw_form menu1] + set hist($setNo,form,menu2) [egw_form menu2] + set hist($setNo,form,menu3) [egw_form menu3] - set hist($setNo,form,logic1) [wform logic1] - set hist($setNo,form,logic2) [wform logic2] + 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) [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 {} - 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 + } } } - set hist($setNo,scan) 0 + 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 "