X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=fd25d08ff8236d9404a0774351ee919a70b0e604;hb=a61ad0378b93e99e362a1d92c33d701dbf103eba;hp=ede4eed6712f6b0ca9e13cd3d257b4d9767e52da;hpb=fff045d159e76bb8bb856fd7d2e6d34c1498d5a5;p=egate.git diff --git a/www/search.egw b/www/search.egw index ede4eed..fd25d08 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.27 1996/01/12 10:03:19 adam Exp $ +# $Id: search.egw,v 1.38 1996/03/13 14:07:31 adam Exp $ -proc start-scan {scanNo cache dir initSet} { +proc start-scan {scanNo targetNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -14,23 +14,66 @@ 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 + button-main 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 {} @@ -115,7 +151,7 @@ proc start-scan {scanNo cache dir initSet} { html {Next Terms | } } html {} - button-new-query 0 $setNo + button-new-query $setNo if {!$debug} return 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,144 +177,133 @@ 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 incr nextSetNo } else { - catch {unset hist($setNo,hits)} + catch {unset hist($setNo,$targetNo,hits)} } 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 host $hist($setNo,0,host) + + set databases [splitDatabaseSpec $host] - set b [wform base] - if {[wform baseall] != ""} { - set hist($setNo,database) $databases + set b [egw_form base] + if {[egw_form baseall] != ""} { + set hist($setNo,$targetNo,database) $databases } elseif {$b == ""} { - set hist($setNo,database) $databases + set hist($setNo,$targetNo,database) $databases } else { - set hist($setNo,database) $b + set hist($setNo,$targetNo,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 == ""} { + set hist($setNo,format) brief + set hist($setNo,sort) server + + set i [lindex $sessionParms 2] + if {[string length $i] == 0} { for {set j 1} {$j <= 3} {incr j} { - if {[wform scan$j] != ""} { + if {[egw_form scan$j] != ""} { set i $j break } } } - if {$i != ""} { + if {[string length $i] != 0} { 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 {} $setNo + start-scan $scanNo $targetNo 0 {} $setNo html "\n" - wabort + egw_abort return } - set query [build-query $hist($setNo,host) 3] - if {"x$query" == "x"} { + set query [build-query $hist($setNo,0,host) 3] + if {[string length $query] == 0} { html "