X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=587e94d392dd9aac820ff5684ff9e5a41d951f31;hb=71ad5b6272d0bc6320bea6c1ec10f5e10bbfe8ef;hp=daaf3b7fb70e32b74e0b4e700bfb6bb58e4fdeb5;hpb=6ceeaa167e3ef2970b6ef0ce2b6c7d9c362eda0a;p=egate.git diff --git a/www/search.egw b/www/search.egw index daaf3b7..587e94d 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.22 1996/01/03 08:59:43 adam Exp $ +# $Id: search.egw,v 1.25 1996/01/08 08:42:17 adam Exp $ proc start-scan {scanNo cache dir} { global sessionId @@ -11,6 +11,8 @@ proc start-scan {scanNo cache dir} { global targets global nextSetNo global env + global useIcons + global debug set host $hist($setNo,host) @@ -20,7 +22,6 @@ proc start-scan {scanNo cache dir} { if {$hist($setNo,$scanNo,scanTerm) == ""} { displayError "Empty query" \ "You must specify at least one search word" - html "\n" wabort return } @@ -37,24 +38,55 @@ proc start-scan {scanNo cache dir} { if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { return } + button-europagate + html {Backward} "\n" + html / $sessionId {/search.egw/} $setNo + [expr $scanNo - 1] + b {">} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } html {Forward
} + html / $sessionId {/search.egw/} $setNo + [expr $scanNo + 1] + f {">} + if {$useIcons} { + html {} + } else { + html {Next Terms | } + } + html {} + button-new-query 0 $setNo + html "

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

\n" + + button-europagate html {Backward} "\n" + html / $sessionId {/search.egw/} $setNo + [expr $scanNo - 1] + b {">} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } html {Forward
} + html / $sessionId {/search.egw/} $setNo + [expr $scanNo + 1] + f {">} + if {$useIcons} { + html {} + } else { + html {Next Terms | } + } + html {} + button-new-query 0 $setNo + if {!$debug} return html "

\n" html "

Debug information

\n" html "sessionId: $sessionId
\n" @@ -67,9 +99,7 @@ proc start-scan {scanNo cache dir} { html "databases: " $hist($setNo,database) "
\n" html "selected: " [wform base] "
\n" html "setNo: " $setNo "
\n" - html "nextSetNo: " $nextSetNo "
\n" - - html "\n" + html "nextSetNo: " $nextSetNo "
\n" } proc buttons {setNo setMax startPos after} { @@ -78,20 +108,8 @@ proc buttons {setNo setMax startPos after} { global env global hist - if {!$useIcons && $after && $setMax < [z39.$setNo resultCount]} { - html "

\n" - html "

\n" - html {} - html "
\n" - } - html "

\n" - if {$useIcons} { - html {Europagate} - } + button-europagate if {$setMax < [z39.$setNo resultCount]} { html {Previous Records} " | \n" } } - html {} - } else { - html {">New Query} " | \n" - } + button-new-query 1 $setNo + button-new-target 1 + button-view-history 0 - html {} - } else { - html {">New Target} - } html "

\n" - if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} { - html "

\n" - html {} - html "

\n" - } - } if {[info commands saveState] == ""} { @@ -165,6 +160,8 @@ proc buttons {setNo setMax startPos after} { } else { catch {unset hist($setNo,hits)} } + set hist($setNo,scan) 0 + set hist($setNo,form,menu1) [wform menu1] set hist($setNo,form,menu2) [wform menu2] set hist($setNo,form,menu3) [wform menu3] @@ -175,6 +172,7 @@ proc buttons {setNo setMax startPos after} { set hist($setNo,form,logic1) [wform logic1] set hist($setNo,form,logic2) [wform logic2] + set hist($setNo,form,logic3) {} set host $hist($setNo,host) set databases [lindex $targets($host) 1] @@ -199,11 +197,11 @@ proc buttons {setNo setMax startPos after} { set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0] set hist($setNo,scanAttr) [lindex $termPlusAttr 1] start-scan $scanNo 0 {} + html "\n" wabort return } } - set hist($setNo,scan) 0 set query [build-query $hist($setNo,host) 3] if {"x$query" == "x"} { html " WWW/Z39.50 Gateway Search\n\n" @@ -214,6 +212,7 @@ proc buttons {setNo setMax startPos after} { } set hist($setNo,query) $query } else { + if {![info exists hist($setNo,scan)]} return if {$hist($setNo,scan) > 0} { set scanNo [lindex $sessionParms 1] set dir [lindex $sessionParms 2] @@ -221,6 +220,7 @@ proc buttons {setNo setMax startPos after} { set scanNo 1000 } start-scan $scanNo 1 $dir + html "\n" wabort } } @@ -238,9 +238,14 @@ proc buttons {setNo setMax startPos after} { return } set r [z39.$setNo resultCount] - html "

Search result $r hits

\n" - wflush set setOffset [z39.$setNo numberOfRecordsReturned] + if {$setOffset > 0} { + html {

Records 1-} $setOffset " out of $r

\n" + } else { + html "

No hits

\n" + } + wflush + html "