X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=88969cd0c800b6446184757d26c05e149b017c00;hb=8bafbc608e1ffba9ee87f4856e586dffa57901b8;hp=9263dfa57c03127a6c79f0bedd1d08b9f14f0fd7;hpb=2db244d8b36c27ed7af8591fe334869fef60c57b;p=egate.git diff --git a/www/search.egw b/www/search.egw index 9263dfa..88969cd 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.33 1996/02/29 15:41:39 adam Exp $ +# $Id: search.egw,v 1.39 1996/03/14 11:50:48 adam Exp $ -proc start-scan {scanNo cache dir initSet} { +proc start-scan {scanNo targetNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -14,14 +14,14 @@ proc start-scan {scanNo cache dir initSet} { global useIcons global debug - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) html " WWW/Z39.50 Gateway Scan " [splitHostSpec $host] html " \n" html "\n" set useIcons 1 - button-europagate + button-main if {$dir == "b"} { set lines 20 @@ -35,12 +35,13 @@ proc start-scan {scanNo cache dir initSet} { } if {$hist($setNo,$scanNo,scanTerm) != ""} { if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { - button-new-query 0 $setNo + button-new-query $setNo egw_log debug "z39_scan failed" return } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo - 1] + b {">} if {$useIcons} { html {} @@ -49,7 +50,8 @@ proc start-scan {scanNo cache dir initSet} { } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo + 1] + f {">} if {$useIcons} { html {} @@ -58,20 +60,20 @@ proc start-scan {scanNo cache dir initSet} { } html {} } - button-new-query 0 $setNo + button-new-query $setNo - set databases [lindex $targets($host) 1] + set databases [splitDatabaseSpec $host] if {$initSet == ""} { set databaseDefault [lindex $databases 0] set oSetNo 0 } else { set oSetNo $initSet - set databaseDefault $hist($oSetNo,database) + set databaseDefault $hist($oSetNo,$targetNo,database) } html {
} \n + html / $sessionId {/search.egw/} $setNo + $targetNo {+1" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -118,8 +120,8 @@ proc start-scan {scanNo cache dir initSet} { set useIcons 0 if {$hist($setNo,$scanNo,scanTerm) == ""} { - button-europagate - button-new-query 0 $setNo + button-main + button-new-query $setNo return } @@ -127,10 +129,11 @@ proc start-scan {scanNo cache dir initSet} { display-scan $setNo $scanNo 0 html "

\n" - button-europagate + button-main html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo - 1] + b {">} if {$useIcons} { html {} @@ -139,7 +142,8 @@ proc start-scan {scanNo cache dir initSet} { } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo + 1] + f {">} if {$useIcons} { html {} @@ -147,7 +151,7 @@ proc start-scan {scanNo cache dir initSet} { html {Next Terms | } } html {} - button-new-query 0 $setNo + button-new-query $setNo if {!$debug} return html "

\n" @@ -158,53 +162,18 @@ proc start-scan {scanNo cache dir initSet} { html $e {: } $env($e) {
} \n } html "form: " [egw_form] "
\n" - html "target: " $host "
\n" - html "databases: " $hist($setNo,database) "
\n" + html "databases: " $hist($setNo,$targetNo,database) "
\n" html "selected: " [egw_form base] "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" } -proc buttons {setNo setMax startPos after} { - global sessionId - global useIcons - global env - global hist - - html "

\n" - button-europagate - if {$setMax > 0 && $setMax < [z39.$setNo resultCount]} { - html {Next Records} - } else { - html {">Next Records} " | \n" - } - } - if {$setMax > 0 && $startPos != "" && $startPos != "1"} { - html {} - } else { - html {">Previous Records} " | \n" - } - } - button-new-query 1 $setNo - button-new-target 1 - button-view-history 0 - - html "

\n" -} - if {[info commands saveState] == ""} { source z39util.tcl + if {![info exists debug]} { + session-lost + egw_abort + } } global sessionWait global nextSetNo @@ -212,18 +181,21 @@ proc buttons {setNo setMax startPos after} { global hist set setNo [lindex $sessionParms 0] - set startPos [lindex $sessionParms 1] - set endPos [lindex $sessionParms 2] + set targetNo [lindex $sessionParms 1] + set startPos [lindex $sessionParms 2] + set endPos [lindex $sessionParms 3] if {[egw_form] != ""} { - set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) - set hist($nextSetNo,host) $hist($setNo,host) + set hist($nextSetNo,$targetNo,idAuthentication) \ + $hist($setNo,$targetNo,idAuthentication) + set hist($nextSetNo,$targetNo,host) \ + $hist($setNo,$targetNo,host) if {$nextSetNo == $setNo} { set setNo $nextSetNo incr nextSetNo } else { - catch {unset hist($setNo,hits)} + catch {unset hist($setNo,$targetNo,hits)} } set hist($setNo,scan) 0 @@ -239,23 +211,27 @@ proc buttons {setNo setMax startPos after} { set hist($setNo,form,logic2) [egw_form logic2] set hist($setNo,form,logic3) {} - set host $hist($setNo,host) - set databases [lindex $targets($host) 1] + set host $hist($setNo,0,host) + + set databases [splitDatabaseSpec $host] set b [egw_form base] if {[egw_form baseall] != ""} { - set hist($setNo,database) $databases + set hist($setNo,$targetNo,database) $databases } elseif {$b == ""} { - set hist($setNo,database) $databases + set hist($setNo,$targetNo,database) $databases } else { - set hist($setNo,database) $b + set hist($setNo,$targetNo,database) $b } set hist($setNo,maxPresent) [egw_form hits] if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } - set i [lindex $sessionParms 1] - if {$i == ""} { + set hist($setNo,format) brief + set hist($setNo,sort) server + + set i [lindex $sessionParms 2] + if {[string length $i] == 0} { for {set j 1} {$j <= 3} {incr j} { if {[egw_form scan$j] != ""} { set i $j @@ -263,123 +239,75 @@ proc buttons {setNo setMax startPos after} { } } } - if {$i != ""} { + if {[string length $i] != 0} { set scanNo 1000 set hist($setNo,scan) $i - set termPlusAttr [build-scan $hist($setNo,host) $i] + set termPlusAttr [build-scan $hist($setNo,0,host) $i] set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0] set hist($setNo,scanAttr) [lindex $termPlusAttr 1] - start-scan $scanNo 0 {} $setNo + start-scan $scanNo $targetNo 0 {} $setNo html "\n" egw_abort return } - set query [build-query $hist($setNo,host) 3] - if {"x$query" == "x"} { + set query [build-query $hist($setNo,0,host) 3] + if {[string length $query] == 0} { html " WWW/Z39.50 Gateway Search\n\n" displayError "Empty query" \ "You must specify at least one search word" html "\n" egw_abort } - set hist($setNo,query) $query - } elseif {[lindex $sessionParms 1] == "hyper"} { + set hist($setNo,0,query) $query + } elseif {[lindex $sessionParms 2] == "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) + set hist($nextSetNo,$targetNo,idAuthentication) \ + $hist($setNo,$targetNo,idAuthentication) + set hist($nextSetNo,$targetNo,host) \ + $hist($setNo,$targetNo,host) + set hist($nextSetNo,$targetNo,database) \ + $hist($setNo,$targetNo,database) if {$nextSetNo == $setNo} { set setNo $nextSetNo incr nextSetNo } else { - catch {unset hist($setNo,hits)} + catch {unset hist($setNo,$targetNo,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 hist($setNo,$targetNo,query) \ + "$hist($setNo,scanAttr) \"[lindex $sessionParms 3]\"" + egw_log debug "hyper databases: $hist($setNo,$targetNo,database)" + set hist($setNo,form,entry1) [lindex $sessionParms 3] set startPos "" - } elseif {[lindex $sessionParms 1] == "scan"} { + } elseif {[lindex $sessionParms 2] == "scan"} { egw_log debug "star scan" set scanNo 1000 set hist($setNo,$scanNo,scanTerm) {} - start-scan $scanNo 0 {} {} + start-scan $scanNo $targetNo 0 {} {} html "\n" egw_abort } else { if {![info exists hist($setNo,scan)]} return if {$hist($setNo,scan) > 0} { - set scanNo [lindex $sessionParms 1] - set dir [lindex $sessionParms 2] + set scanNo [lindex $sessionParms 2] + set dir [lindex $sessionParms 3] if {$scanNo == ""} { set scanNo 1000 } - start-scan $scanNo 1 $dir $setNo + start-scan $scanNo $targetNo 1 $dir $setNo html "\n" egw_abort } } - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) html " WWW/Z39.50 Gateway Search " [splitHostSpec $host] html " \n" html "\n" - 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 {$setMax > 0} { - html {

Records 1-} $setMax " out of $r

\n" - } else { - html "

No hits

\n" - } - egw_flush - html "