X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=9263dfa57c03127a6c79f0bedd1d08b9f14f0fd7;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=670facdcbcb2a2a869807d4a52fb379e0e2eeedf;hpb=0d7108cd3425504a09522f915dda5c9158443084;p=egate.git diff --git a/www/search.egw b/www/search.egw index 670facd..9263dfa 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.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 " WWW/Z39.50 Gateway Scan " $host " \n" + html " WWW/Z39.50 Gateway Scan " [splitHostSpec $host] + html " \n" html "\n" + set useIcons 1 + button-europagate + + if {$dir == "b"} { + set lines 20 + set pos 20 + } elseif {$dir == "f"} { + set lines 20 + set pos 1 + } else { + set lines 20 + set pos 10 + } + if {$hist($setNo,$scanNo,scanTerm) != ""} { + if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { + button-new-query 0 $setNo + egw_log debug "z39_scan failed" + return + } + html {} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } + + html {} + if {$useIcons} { + html {} + } else { + html {Next Terms | } + } + html {} + } + button-new-query 0 $setNo + set databases [lindex $targets($host) 1] if {$initSet == ""} { @@ -50,14 +91,15 @@ proc start-scan {scanNo cache dir initSet} { html { All
} \n } - html "Input your search criteria:
\n" } + html "Input your scan criteria:
\n" set fields [lindex $targets($host) 2] set no 1 html {} html "\n" - html {} + html {
} + + set useIcons 0 if {$hist($setNo,$scanNo,scanTerm) == ""} { - wabort - return - } - if {$dir == "b"} { - set lines 20 - set pos 20 - } elseif {$dir == "f"} { - set lines 20 - set pos 1 - } else { - set lines 20 - set pos 10 - } - if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { + button-europagate + button-new-query 0 $setNo return } - 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 "\n" - wabort + } 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 "\n" + egw_abort + } else { if {![info exists hist($setNo,scan)]} return if {$hist($setNo,scan) > 0} { set scanNo [lindex $sessionParms 1] @@ -266,37 +318,41 @@ proc buttons {setNo setMax startPos after} { } start-scan $scanNo 1 $dir $setNo html "\n" - wabort + egw_abort } } set host $hist($setNo,host) - html " WWW/Z39.50 Gateway Search " $host " \n" + html " WWW/Z39.50 Gateway Search " [splitHostSpec $host] + html " \n" html "\n" - set startPos [lindex $sessionParms 1] - set endPos [lindex $sessionParms 2] set setMax 0 set setOffset 0 + set useIcons 1 if {$startPos == ""} { if {[z39search $setNo 1 0 B] != "1"} { return } set r [z39.$setNo resultCount] + + set setMax [z39.$setNo resultCount] + if {$setMax > $hist($setNo,maxPresent)} { + set setMax $hist($setNo,maxPresent) + } + buttons $setNo $setMax $startPos 0 + set setOffset [z39.$setNo numberOfRecordsReturned] - if {$setOffset > 0} { - html {

Records 1-} $setOffset " out of $r

\n" + if {$setMax > 0} { + html {

Records 1-} $setMax " out of $r

\n" } else { html "

No hits

\n" } - wflush + egw_flush html "