X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=www%2Fsearch.egw;h=9263dfa57c03127a6c79f0bedd1d08b9f14f0fd7;hb=309c35b155c617707995d52197f64f7e17d143a2;hp=ede4eed6712f6b0ca9e13cd3d257b4d9767e52da;hpb=fff045d159e76bb8bb856fd7d2e6d34c1498d5a5;p=egate.git diff --git a/www/search.egw b/www/search.egw index ede4eed..9263dfa 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.27 1996/01/12 10:03:19 adam Exp $ +# $Id: search.egw,v 1.33 1996/02/29 15:41:39 adam Exp $ proc start-scan {scanNo cache dir initSet} { global sessionId @@ -16,9 +16,50 @@ proc start-scan {scanNo cache dir initSet} { set host $hist($setNo,host) - html "
\n" + html "
\n" display-scan $setNo $scanNo 0 html "
\n" @@ -125,10 +157,10 @@ 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 "selected: " [egw_form base] " \n" html "setNo: " $setNo " \n" html "nextSetNo: " $nextSetNo " \n" } @@ -141,7 +173,7 @@ proc buttons {setNo setMax startPos after} { html "
\n" button-europagate - if {$setMax < [z39.$setNo resultCount]} { + if {$setMax > 0 && $setMax < [z39.$setNo resultCount]} { html {Next Records} " | \n" } } - if {$startPos != "" && $startPos != "1"} { + if {$setMax > 0 && $startPos != "" && $startPos != "1"} { html {\n" - wabort + egw_abort return } set query [build-query $hist($setNo,host) 3] @@ -246,9 +280,34 @@ proc buttons {setNo setMax startPos after} { displayError "Empty query" \ "You must specify at least one search word" html "\n" - wabort + egw_abort } set hist($setNo,query) $query + } elseif {[lindex $sessionParms 1] == "hyper"} { + egw_log debug "hyper search" + set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) + set hist($nextSetNo,host) $hist($setNo,host) + set hist($nextSetNo,database) $hist($setNo,database) + + if {$nextSetNo == $setNo} { + set setNo $nextSetNo + incr nextSetNo + } else { + catch {unset hist($setNo,hits)} + } + set hist($setNo,scan) 0 + set hist($setNo,query) \ + "$hist($setNo,scanAttr) \"[lindex $sessionParms 2]\"" + egw_log debug "hyper databases: $hist($setNo,database)" + set hist($setNo,form,entry1) [lindex $sessionParms 2] + set startPos "" + } elseif {[lindex $sessionParms 1] == "scan"} { + egw_log debug "star scan" + set scanNo 1000 + set hist($setNo,$scanNo,scanTerm) {} + start-scan $scanNo 0 {} {} + html "