X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=9263dfa57c03127a6c79f0bedd1d08b9f14f0fd7;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=45589ac97cef816e49128b2a3296e1e90d920332;hpb=cc5af6a5323f9576c208519dbf4351b4f818e166;p=egate.git diff --git a/www/search.egw b/www/search.egw index 45589ac..9263dfa 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.33 1996/02/29 15:41:39 adam Exp $ -proc start-scan {scanNo cache dir} { +proc start-scan {scanNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -16,15 +16,13 @@ proc start-scan {scanNo cache dir} { 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" - - if {$hist($setNo,$scanNo,scanTerm) == ""} { - displayError "Empty query" \ - "You must specify at least one search word" - wabort - return - } + + set useIcons 1 + button-europagate + if {$dir == "b"} { set lines 20 set pos 20 @@ -35,32 +33,97 @@ proc start-scan {scanNo cache dir} { set lines 20 set pos 10 } - if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { - return + 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-europagate + button-new-query 0 $setNo - html {} - if {$useIcons} { - html {} + set databases [lindex $targets($host) 1] + + if {$initSet == ""} { + set databaseDefault [lindex $databases 0] + set oSetNo 0 } else { - html {Previous Terms | } + set oSetNo $initSet + set databaseDefault $hist($oSetNo,database) + } + + html {
} \n + set nodb [llength $databases] + if {$nodb > 1} { + if {$nodb > 2} { + html "Databases:
\n" + } + set i 0 + foreach d $databases { + html { } $d \n + } else { + html {" checked> } $d \n + } + } + html "
\n" + if {$nodb > 2} { + html { All
} \n + } + } + html "Input your scan criteria:
\n" + set fields [lindex $targets($host) 2] + set no 1 + html {\n" + html { } + html {} + html "\n" + html {

} - html {} - if {$useIcons} { - html {} - } else { - html {Next Terms | } + set useIcons 0 + if {$hist($setNo,$scanNo,scanTerm) == ""} { + button-europagate + button-new-query 0 $setNo + return } - html {} - button-new-query 0 $setNo - html "

\n" + html "

\n" display-scan $setNo $scanNo 0 html "

\n" @@ -94,10 +157,10 @@ proc start-scan {scanNo cache dir} { 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" } @@ -110,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 - return + set i [lindex $sessionParms 1] + if {$i == ""} { + for {set j 1} {$j <= 3} {incr j} { + if {[egw_form scan$j] != ""} { + set i $j + break + } } } + if {$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 {} $setNo + html "\n" + egw_abort + return + } set query [build-query $hist($setNo,host) 3] if {"x$query" == "x"} { html " WWW/Z39.50 Gateway Search\n\n" 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 "\n" + egw_abort } else { if {![info exists hist($setNo,scan)]} return if {$hist($setNo,scan) > 0} { @@ -219,39 +316,43 @@ proc buttons {setNo setMax startPos after} { if {$scanNo == ""} { set scanNo 1000 } - start-scan $scanNo 1 $dir + 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 "