X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fmsearch.egw;h=5544a3c2080592314d58760e3b9b3188a629261d;hb=8bafbc608e1ffba9ee87f4856e586dffa57901b8;hp=084353dbea3ef473c88f75325baf176a783afdc8;hpb=e406f6fe976eeae769f193a9d48938d903c02543;p=egate.git
diff --git a/www/msearch.egw b/www/msearch.egw
index 084353d..5544a3c 100644
--- a/www/msearch.egw
+++ b/www/msearch.egw
@@ -1,9 +1,13 @@
{
-# $Id: msearch.egw,v 1.17 1996/03/08 16:47:04 adam Exp $
+# $Id: msearch.egw,v 1.21 1996/03/14 11:50:45 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
+ if {![info exists debug]} {
+ session-lost
+ egw_abort
+ }
}
global sessionWait
global nextSetNo
@@ -16,7 +20,21 @@
set setNo [lindex $sessionParms 0]
- if {[egw_form menu1] != ""} {
+ if {[llength [egw_form]] > 0} {
+ if {[string length [egw_form host]] > 0} {
+ set hist($setNo,0,host) [llength [egw_form host]]
+ set i 1
+ foreach t [egw_form host] {
+ set hist($setNo,$i,host) $t
+ set hist($setNo,$i,database) [splitDatabaseSpec $t]
+ set hist($setNo,$i,idAuthentication) {}
+ incr i
+ }
+ }
+ if {![info exists hist($setNo,0,host)]} {
+ displayError {No servers selected} {}
+ egw_abort
+ }
set hist($nextSetNo,0,host) $hist($setNo,0,host)
for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} {
set hist($nextSetNo,$i,host) $hist($setNo,$i,host)
@@ -30,6 +48,21 @@
for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} {
set hist($setNo,$i,query) [build-query $hist($setNo,$i,host) 3]
}
+
+ 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) [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 hist($setNo,maxPresent) [egw_form hits]
if {$hist($setNo,maxPresent) == ""} {
set hist($setNo,maxPresent) 20
@@ -45,9 +78,10 @@
}
set useIcons 1
- button-europagate
- button-new-query 1 $setNo
- button-new-target 0
+ button-main
+ button-new-query $setNo
+ button-view-history
+ button-new-target
html "
\n"
z39msearch $setNo B 1 $hist($setNo,maxPresent) 1
@@ -55,9 +89,10 @@
display-result-set-m $setNo
set useIcons 0
- button-europagate
- button-new-query 1 $setNo
- button-new-target 0
+ button-main
+ button-new-query $setNo
+ button-view-history
+ button-new-target
}
{
@@ -70,7 +105,6 @@
html $e {: } $env($e) {
} \n
}
html "form: " [egw_form] "
\n"
- html "target: " $host "
\n"
html "query: --" $hist($setNo,1,query) "--
\n"
html "database: " $hist($setNo,1,database) "
\n"
html "sort: " $hist($setNo,sort) "
\n"