X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=d6d871754f9b3ae88475637061cc9b5154bd5c45;hb=cd42e5ba6964c47e437820310d91284c74f11bc5;hp=0feff70ee1a3acb30efa7173faada002d3673cd4;hpb=df7b985601de6c729147a6fd6588adba6f905480;p=egate.git diff --git a/www/search.egw b/www/search.egw index 0feff70..d6d8717 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.21 1996/01/02 10:52:28 adam Exp $ +# $Id: search.egw,v 1.29 1996/01/12 13:39:22 adam Exp $ -proc perform-scan {} { +proc start-scan {scanNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -11,31 +11,137 @@ proc perform-scan {} { global targets global nextSetNo global env + global useIcons + global debug + + set host $hist($setNo,host) - set scanNo 1000 + html " WWW/Z39.50 Gateway Scan " $host " \n" + html "\n" - set termPlusAttr [build-scan $hist($setNo,host) 3] + set databases [lindex $targets($host) 1] - if {"$termPlusAttr" == ""} { - html " WWW/Z39.50 Gateway Scan\n\n" - displayError "Empty query" \ - "You must specify at least one search word" - html "\n" - wabort + if {$initSet == ""} { + set databaseDefault [lindex $databases 0] + set oSetNo 0 + } else { + set oSetNo $initSet + set databaseDefault $hist($oSetNo,database) } - set hist($setNo,scanAttr) [lindex $termPlusAttr 1] - set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0] - set host $hist($setNo,host) + 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 search criteria:
\n" + } + set fields [lindex $targets($host) 2] + set no 1 + html {\n" + html { } + html {} + html "\n" + html {

} - html " WWW/Z39.50 Gateway Scan " $host " \n" - html "\n" + button-europagate - if {[z39scan $setNo $scanNo 0 20 10] != "1"} { + if {$hist($setNo,$scanNo,scanTerm) == ""} { + button-new-query 0 $setNo + 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"} { + return + } + + html {} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } + + html {} + 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 {} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } + + html {} + 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" @@ -48,9 +154,7 @@ proc perform-scan {} { 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} { @@ -59,26 +163,14 @@ 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 {Next RecordsNext Records} } else { html {">Next Records} " | \n" @@ -90,40 +182,17 @@ proc buttons {setNo setMax startPos after} { html + [expr $startPos - $hist($setNo,maxPresent)] html + [expr $startPos - 1] if {$useIcons} { - html {">} } else { 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] == ""} { @@ -136,7 +205,7 @@ proc buttons {setNo setMax startPos after} { set setNo [lindex $sessionParms 0] - if {[wform menu1] != ""} { + if {[wform] != ""} { set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) set hist($nextSetNo,host) $hist($setNo,host) @@ -146,6 +215,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] @@ -156,6 +227,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] @@ -172,10 +244,25 @@ proc buttons {setNo setMax startPos after} { if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } - - if {[wform submit] == "Scan"} { - perform-scan + set i [lindex $sessionParms 1] + if {$i == ""} { + for {set j 1} {$j <= 3} {incr j} { + if {[wform 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 {} {} + html "\n" wabort + return } set query [build-query $hist($setNo,host) 3] if {"x$query" == "x"} { @@ -186,6 +273,25 @@ proc buttons {setNo setMax startPos after} { wabort } 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 + } + if {![info exists hist($setNo,scan)]} return + if {$hist($setNo,scan) > 0} { + set scanNo [lindex $sessionParms 1] + set dir [lindex $sessionParms 2] + if {$scanNo == ""} { + set scanNo 1000 + } + start-scan $scanNo 1 $dir $setNo + html "\n" + wabort + } } set host $hist($setNo,host) @@ -201,9 +307,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 "