X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=9263dfa57c03127a6c79f0bedd1d08b9f14f0fd7;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=588f13a4d6cc9585402281689f447ad3686428d3;hpb=ebeb5e591b8f1bf6c5045efaddf74f3eee7bdbaf;p=egate.git diff --git a/www/search.egw b/www/search.egw index 588f13a..9263dfa 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.30 1996/01/24 08:27:29 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" display-scan $setNo $scanNo 0 @@ -165,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" egw_abort return @@ -273,14 +283,32 @@ proc buttons {setNo setMax startPos after} { egw_abort } set hist($setNo,query) $query - } else { - if {[lindex $sessionParms 1] == "scan"} { - set scanNo 1000 - set hist($setNo,$scanNo,scanTerm) {} - start-scan $scanNo 0 {} {} - html "\n" - egw_abort + } 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 "