X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fsearch.egw;h=738906bd5ea7c1762c8bd8154ed96cca339f0b4c;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=670facdcbcb2a2a869807d4a52fb379e0e2eeedf;hpb=0d7108cd3425504a09522f915dda5c9158443084;p=egate.git diff --git a/www/search.egw b/www/search.egw index 670facd..738906b 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.28 1996/01/12 13:08:30 adam Exp $ +# $Id: search.egw,v 1.34 1996/03/07 12:46:09 adam Exp $ -proc start-scan {scanNo cache dir initSet} { +proc start-scan {scanNo targetNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -14,11 +14,54 @@ proc start-scan {scanNo cache dir initSet} { global useIcons global debug - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) - html "
\n" + html "
\n" display-scan $setNo $scanNo 0 html "
\n"
button-europagate
html {}
+ html / $sessionId {/search.egw/} $setNo + $targetNo +
+ html [expr $scanNo - 1] + b {">}
if {$useIcons} {
html {}
@@ -107,7 +142,8 @@ proc start-scan {scanNo cache dir initSet} {
}
html {}
+ html / $sessionId {/search.egw/} $setNo + $targetNo +
+ html [expr $scanNo + 1] + f {">}
if {$useIcons} {
html {}
@@ -125,52 +161,14 @@ 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 "databases: " $hist($setNo,$targetNo,database) "
\n"
+ html "selected: " [egw_form base] "
\n"
html "setNo: " $setNo "
\n"
html "nextSetNo: " $nextSetNo "
\n"
}
-proc buttons {setNo setMax startPos after} {
- global sessionId
- global useIcons
- global env
- global hist
-
- html "
\n" - button-europagate - if {$setMax < [z39.$setNo resultCount]} { - html {} - } else { - html {">Next Records} " | \n" - } - } - if {$startPos != "" && $startPos != "1"} { - html {} - } else { - html {">Previous Records} " | \n" - } - } - button-new-query 1 $setNo - button-new-target 1 - button-view-history 0 - - html "
\n" -} - if {[info commands saveState] == ""} { source z39util.tcl } @@ -180,10 +178,15 @@ proc buttons {setNo setMax startPos after} { global hist set setNo [lindex $sessionParms 0] + set targetNo [lindex $sessionParms 1] + set startPos [lindex $sessionParms 2] + set endPos [lindex $sessionParms 3] - if {[wform] != ""} { - set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) - set hist($nextSetNo,host) $hist($setNo,host) + if {[egw_form] != ""} { + set hist($nextSetNo,$targetNo,idAuthentication) \ + $hist($setNo,$targetNo,idAuthentication) + set hist($nextSetNo,$targetNo,host) \ + $hist($setNo,$targetNo,host) if {$nextSetNo == $setNo} { set setNo $nextSetNo @@ -193,37 +196,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 host $hist($setNo,0,host) set databases [lindex $targets($host) 1] - set b [wform base] - if {[wform baseall] != ""} { - set hist($setNo,database) $databases + set b [egw_form base] + if {[egw_form baseall] != ""} { + set hist($setNo,0,database) $databases } elseif {$b == ""} { - set hist($setNo,database) $databases + set hist($setNo,0,database) $databases } else { - set hist($setNo,database) $b + set hist($setNo,0,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] + set i [lindex $sessionParms 2] if {$i == ""} { for {set j 1} {$j <= 3} {incr j} { - if {[wform scan$j] != ""} { + if {[egw_form scan$j] != ""} { set i $j break } @@ -232,99 +235,72 @@ proc buttons {setNo setMax startPos after} { if {$i != ""} { set scanNo 1000 set hist($setNo,scan) $i - set termPlusAttr [build-scan $hist($setNo,host) $i] + set termPlusAttr [build-scan $hist($setNo,0,host) $i] set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0] set hist($setNo,scanAttr) [lindex $termPlusAttr 1] - start-scan $scanNo 0 {} {} + start-scan $scanNo $targetNo 0 {} $setNo html "\n" - wabort + egw_abort return } - set query [build-query $hist($setNo,host) 3] + set query [build-query $hist($setNo,0,host) 3] if {"x$query" == "x"} { html "