projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Minor changes.
[egate.git] / www / msearch.egw
diff --git a/www/msearch.egw b/www/msearch.egw
index 084353d..4e501bd 100644 (file)
--- a/www/msearch.egw
+++ b/www/msearch.egw
@@ -1,9 +1,13 @@
 <html>
 {
-# $Id: msearch.egw,v 1.17 1996/03/08 16:47:04 adam Exp $
+# $Id: msearch.egw,v 1.22 1996/05/15 18:43:37 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)
@@ -28,7 +46,15 @@
         incr nextSetNo
 
         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,$i,query) [build-query $hist($setNo,$i,host) 6]
+        }
+
+        set hist($setNo,scan) 0
+
+        for {set i 1} {$i < 6} {incr i} {
+            set hist($setNo,form,menu$i) [egw_form menu$i]
+            set hist($setNo,form,entry$i) [egw_form entry$i]
+            set hist($setNo,form,logic$i) [egw_form logic$i]
         }
         set hist($setNo,maxPresent) [egw_form hits]
         if {$hist($setNo,maxPresent) == ""} {
@@ -45,9 +71,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 "<br>\n"
     z39msearch $setNo B 1 $hist($setNo,maxPresent) 1
@@ -55,9 +82,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 +98,6 @@
         html $e {: } $env($e) {<br>} \n
     }
     html "form: " [egw_form] " <br>\n"
-    html "target: " $host " <br>\n"
     html "query: --" $hist($setNo,1,query) "-- <br>\n"
     html "database: " $hist($setNo,1,database) "<br>\n"
     html "sort: " $hist($setNo,sort) "<br>\n"
Europgate