X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=9263dfa57c03127a6c79f0bedd1d08b9f14f0fd7;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=0feff70ee1a3acb30efa7173faada002d3673cd4;hpb=df7b985601de6c729147a6fd6588adba6f905480;p=egate.git diff --git a/www/search.egw b/www/search.egw index 0feff70..9263dfa 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.33 1996/02/29 15:41:39 adam Exp $ -proc perform-scan {} { +proc start-scan {scanNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -11,31 +11,145 @@ 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 "
\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 "
\n"
- if {$useIcons} {
- html {}
- }
- if {$setMax < [z39.$setNo resultCount]} {
+ button-europagate
+ if {$setMax > 0 && $setMax < [z39.$setNo resultCount]} {
html {
}
} else {
html {">Next Records} " | \n"
}
}
- if {$startPos != "" && $startPos != "1"} {
+ if {$setMax > 0 && $startPos != "" && $startPos != "1"} {
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" - } - } if {[info commands saveState] == ""} { @@ -135,8 +212,10 @@ proc buttons {setNo setMax startPos after} { global hist set setNo [lindex $sessionParms 0] + set startPos [lindex $sessionParms 1] + set endPos [lindex $sessionParms 2] - if {[wform menu1] != ""} { + if {[egw_form] != ""} { set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) set hist($nextSetNo,host) $hist($setNo,host) @@ -146,36 +225,54 @@ proc buttons {setNo setMax startPos after} { } else { catch {unset hist($setNo,hits)} } - set hist($setNo,form,menu1) [wform menu1] - set hist($setNo,form,menu2) [wform menu2] - set hist($setNo,form,menu3) [wform menu3] + set hist($setNo,scan) 0 + + set hist($setNo,form,menu1) [egw_form menu1] + set hist($setNo,form,menu2) [egw_form menu2] + set hist($setNo,form,menu3) [egw_form 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,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) [wform logic1] - set hist($setNo,form,logic2) [wform logic2] + 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 } - - if {[wform submit] == "Scan"} { - perform-scan - wabort + 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 {} $setNo + html "\n" + egw_abort + return } set query [build-query $hist($setNo,host) 3] if {"x$query" == "x"} { @@ -183,33 +280,79 @@ proc buttons {setNo setMax startPos after} { displayError "Empty query" \ "You must specify at least one search word" html "