X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=a249f6cdaeb40274b0c3cf81a554d5989f75db83;hb=a6e5ecf2a6d6dedf266c5f9d6bc2447a528b199e;hp=ebd2e66fdfb411cedbe2a5496e77367392ecaa0a;hpb=6315a552d51ac08b60d25d8500da5574a83ba530;p=egate.git diff --git a/www/search.egw b/www/search.egw index ebd2e66..a249f6c 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,32 +1,53 @@ { -# $Id: search.egw,v 1.10 1995/11/08 12:42:17 adam Exp $ +# $Id: search.egw,v 1.17 1995/11/14 16:01:51 adam Exp $ -proc buttons {setNo setMax startPos} { +proc buttons {setNo setMax startPos after} { global sessionId global env global hist + if {$after && $setMax < [z39.$setNo resultCount]} { + html "

\n" + html "

\n" + html {} + html "
\n" + } + html "

\n" if {$setMax < [z39.$setNo resultCount]} { - html { Next } "| \n" + html + [expr $setMax + $hist($setNo,maxPresent)] + html {">Next records} " | \n" } if {$startPos != "" && $startPos != "1"} { - html { 1} { - html + [expr $startPos - $hist($setNo,maxPresent)] - html + [expr $startPos - 1] - } - html {"> Prev } "| \n" + html + [expr $startPos - $hist($setNo,maxPresent)] + html + [expr $startPos - 1] + html {">Previous records} " | \n" } - html { New target } " | \n" - html { New query } "

\n" + html {">New query} " | \n" + + html {New target} "

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

\n" + html {} + html "

\n" + } + } if {[info commands saveState] == ""} { @@ -37,21 +58,43 @@ proc buttons {setNo setMax startPos} { global setNo global hist - set oldHost $hist($setNo,host) - - if {[wform menu1] == ""} { - set setNo [lindex $sessionParms 0] - } else { - if {![info exists hist($nextSetNo,host)]} { - set hist($nextSetNo,host) $oldHost - } + set setNo [lindex $sessionParms 0] + if {[wform menu1] != ""} { + set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) + set hist($nextSetNo,host) $hist($setNo,host) set setNo $nextSetNo html "using host " $hist($setNo,host) " WWW/Z39.50 Gateway Search\n\n" + displayError "Empty query" \ + "You must specify at least one search word" + html "\n" + wabort + } + set hist($setNo,query) $query + + set hist($setNo,form,menu1) [wform menu1] + set hist($setNo,form,menu2) [wform menu2] + set hist($setNo,form,menu3) [wform menu3] + + set hist($setNo,form,entry1) [wform entry1] + set hist($setNo,form,entry2) [wform entry2] + set hist($setNo,form,entry3) [wform entry3] + + set hist($setNo,form,logic1) [wform logic1] + set hist($setNo,form,logic2) [wform logic2] + incr nextSetNo + + set host $hist($setNo,host) + set databases [lindex $targets($host) 1] - set hist($setNo,query) [build-query $hist($setNo,host)] set b [wform base] - if {$b == ""} { + if {[wform baseall] != ""} { + set hist($setNo,database) $databases + } elseif {$b == ""} { set hist($setNo,database) $databases } else { set hist($setNo,database) $b @@ -72,21 +115,21 @@ proc buttons {setNo setMax startPos} { set setMax 0 set setOffset 0 if {$startPos == ""} { - if {[z39search $setNo 1] != "1"} { + if {[z39search $setNo 1 0 B] != "1"} { return } set r [z39.$setNo resultCount] html "

Search result $r hits

\n" wflush set setOffset [z39.$setNo numberOfRecordsReturned] - display-rec 1 $setOffset display-brief z39 + display-rec 1 $setOffset display-brief 0 incr setOffset set setMax [z39.$setNo resultCount] if {$setMax > $hist($setNo,maxPresent)} { set setMax $hist($setNo,maxPresent) } } else { - if {[z39search $setNo 0] != "1"} { + if {[z39search $setNo 0 0 B] != "1"} { return } set r [z39.$setNo resultCount] @@ -98,14 +141,14 @@ proc buttons {setNo setMax startPos} { set setMax $endPos } if {$setMax > 0} { - buttons $setNo $setMax $startPos + buttons $setNo $setMax $startPos 0 } } if {$setMax > 0} { - z39present $setNo $setOffset $setMax display-brief + z39present $setNo 0 $setOffset $setMax display-brief B } - buttons $setNo $setMax $startPos + buttons $setNo $setMax $startPos 1 } {