X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=588f13a4d6cc9585402281689f447ad3686428d3;hb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;hp=c72263edcde47c9b3b71ba8cb1aa663315b54ad0;hpb=09f416a26c1c7e35ead317106f985774ec0c97bd;p=egate.git diff --git a/www/search.egw b/www/search.egw index c72263e..588f13a 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.19 1995/12/21 15:49:52 adam Exp $ +# $Id: search.egw,v 1.30 1996/01/24 08:27:29 adam Exp $ -proc perform-scan {} { +proc start-scan {scanNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -11,60 +11,137 @@ proc perform-scan {} { global targets global nextSetNo global env + global useIcons + global debug - set scanNo 1000 + set host $hist($setNo,host) - set termPlusAttr [build-scan $hist($setNo,host) 3] + html " WWW/Z39.50 Gateway Scan " $host " \n" + html "\n" - if {"$termPlusAttr" == ""} { - html " WWW/Z39.50 Gateway Scan\n\n" - displayError "Empty query" \ - "You must specify at least one search word" - html "\n" - wabort + set databases [lindex $targets($host) 1] + + 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 hist($setNo,form,menu1) [wform menu1] - set hist($setNo,form,menu2) "" - set hist($setNo,form,menu3) "" - - set hist($setNo,form,entry1) [wform entry1] - set hist($setNo,form,entry2) "" - set hist($setNo,form,entry3) "" - - set hist($setNo,form,logic1) "" - set hist($setNo,form,logic2) "" - - incr nextSetNo + 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 {

} - set host $hist($setNo,host) - set databases [lindex $targets($host) 1] + button-europagate - set b [wform base] - if {[wform baseall] != ""} { - set hist($setNo,database) $databases - } elseif {$b == ""} { - set hist($setNo,database) $databases + if {$hist($setNo,$scanNo,scanTerm) == ""} { + button-new-query 0 $setNo + egw_abort + return + } + if {$dir == "b"} { + set lines 20 + set pos 20 + } elseif {$dir == "f"} { + set lines 20 + set pos 1 } else { - set hist($setNo,database) $b + set lines 20 + set pos 10 } - set hist($setNo,maxPresent) [wform hits] - if {$hist($setNo,maxPresent) == ""} { - set hist($setNo,maxPresent) 30 + if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { + return } - set host $hist($setNo,host) - set databases [lindex $targets($host) 1] - html " WWW/Z39.50 Gateway Scan " $host " \n" - html "\n" + html {} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } - if {[z39scan $setNo $scanNo 0 20 10] != "1"} { - return + 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" @@ -72,14 +149,12 @@ proc perform-scan {} { 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" - - html "\n" + html "nextSetNo: " $nextSetNo "
\n" } proc buttons {setNo setMax startPos after} { @@ -88,28 +163,17 @@ 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 {} - } + button-europagate if {$setMax < [z39.$setNo resultCount]} { html {} + html {">Next Records} } else { - html {">Next records} " | \n" + html {">Next Records} " | \n" } } if {$startPos != "" && $startPos != "1"} { @@ -118,37 +182,17 @@ proc buttons {setNo setMax startPos after} { html + [expr $startPos - $hist($setNo,maxPresent)] html + [expr $startPos - 1] if {$useIcons} { - html {">} + html {">} } else { - html {">Previous records} " | \n" + 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] == ""} { @@ -160,52 +204,96 @@ proc buttons {setNo setMax startPos after} { global hist set setNo [lindex $sessionParms 0] - if {[wform menu1] != ""} { - if {[wform submit] == "Scan"} { - perform-scan - wabort - } - 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 - } - 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] + if {[egw_form] != ""} { + set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) + set hist($nextSetNo,host) $hist($setNo,host) - set hist($setNo,form,entry1) [wform entry1] - set hist($setNo,form,entry2) [wform entry2] - set hist($setNo,form,entry3) [wform entry3] + if {$nextSetNo == $setNo} { + set setNo $nextSetNo + incr nextSetNo + } else { + catch {unset hist($setNo,hits)} + } + set hist($setNo,scan) 0 - set hist($setNo,form,logic1) [wform logic1] - set hist($setNo,form,logic2) [wform logic2] + set hist($setNo,form,menu1) [egw_form menu1] + set hist($setNo,form,menu2) [egw_form menu2] + set hist($setNo,form,menu3) [egw_form menu3] - incr nextSetNo - + set hist($setNo,form,entry1) [egw_form entry1] + set hist($setNo,form,entry2) [egw_form entry2] + set hist($setNo,form,entry3) [egw_form entry3] + + set hist($setNo,form,logic1) [egw_form logic1] + 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 b [wform base] - if {[wform baseall] != ""} { + set b [egw_form base] + if {[egw_form baseall] != ""} { set hist($setNo,database) $databases } elseif {$b == ""} { set hist($setNo,database) $databases } else { set hist($setNo,database) $b } - set hist($setNo,maxPresent) [wform hits] + set hist($setNo,maxPresent) [egw_form hits] if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } + 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 {} {} + 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" + egw_abort + } + 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" + egw_abort + } + 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" + egw_abort + } } set host $hist($setNo,host) - set databases [lindex $targets($host) 1] html " WWW/Z39.50 Gateway Search " $host " \n" html "\n" @@ -219,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" + } + egw_flush + html "