X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fsearch.egw;h=e526ebd9a65f9995a10f27bea193955875de1d88;hb=7f332a840baf336e34d612cdee0ef27901f0dd11;hp=45589ac97cef816e49128b2a3296e1e90d920332;hpb=cc5af6a5323f9576c208519dbf4351b4f818e166;p=egate.git diff --git a/www/search.egw b/www/search.egw index 45589ac..e526ebd 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.41 2001/02/26 14:32:36 adam Exp $ -proc start-scan {scanNo cache dir} { +proc start-scan {scanNo targetNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -14,17 +14,15 @@ proc start-scan {scanNo cache dir} { 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 {} + if {!$useIcons} { + html "\n | " + } + html {} if {$useIcons} { html {} } else { - html {Previous Terms | } + html {Previous Terms} } - html {} + if {!$useIcons} { + html "\n | " + } + html {} if {$useIcons} { html {} } else { - html {Next Terms | } + 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 + if {![info exists debug]} { + session-lost + egw_abort + } } global sessionWait global nextSetNo @@ -149,137 +193,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 } - 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 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 {[egw_form scan$j] != ""} { + set i $j + break + } } } - set query [build-query $hist($setNo,host) 3] - if {"x$query" == "x"} { + if {[string length $i] != 0} { + set scanNo 1000 + set hist($setNo,scan) $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 $targetNo 0 {} $setNo + html "