X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=www%2Fsearch.egw;h=eabe4b9344aa2b75185065f9c40d5636e6348149;hb=3871eda3b3a1518d4d18c1ffc0ed0375cb88bdf5;hp=670facdcbcb2a2a869807d4a52fb379e0e2eeedf;hpb=0d7108cd3425504a09522f915dda5c9158443084;p=egate.git diff --git a/www/search.egw b/www/search.egw index 670facd..eabe4b9 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.28 1996/01/12 13:08:30 adam Exp $ +# $Id: search.egw,v 1.32 1996/02/12 13:39:40 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,17 +280,35 @@ 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 - } else { - if {[lindex $sessionParms 1] == "scan"} { - set scanNo 1000 - set hist($setNo,$scanNo,scanTerm) {} - start-scan $scanNo 0 {} {} - html "