projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Email gateway obeys 'Reply-To:' in header.
[egate.git] / www / query.egw
diff --git a/www/query.egw b/www/query.egw
index b28bcef..fec5af1 100644 (file)
--- a/www/query.egw
+++ b/www/query.egw
@@ -4,7 +4,7 @@
 </head>
 <body>
 {
-# $Id: query.egw,v 1.30 1996/01/24 14:14:19 adam Exp $
+# $Id: query.egw,v 1.34 1996/02/29 15:41:39 adam Exp $
 
     if {[info commands saveState] == ""} {
         source z39util.tcl
@@ -40,31 +40,29 @@ proc ok-response {} {
     set hist($setNo,host) $host
     set hist($setNo,idAuthentication) [lindex $targets($host) 3]
 
-    if {[catch {z39 failback fail-response}]} {
-        ir z39
-    }
+    mkAssoc z39 $host
 
-    html "<h2>Search in " [lindex $targets($host) 0] "</h2><br>\n"
     z39 callback ok-response
     z39 failback fail-response
-    if {$host != $oldHost} {
+    set thisHost [splitHostSpec $host]
+    if {[string compare $thisHost $oldHost]} {
         catch {z39 disconnect}
 
         set sessionWait 0
-        if {[catch {z39 connect $host}]} {
-            displayError "Cannot connect to target ${host}" {}
+        if {[catch {z39 connect $thisHost}]} {
+            displayError "Cannot connect to target ${thisHost}" {}
             html "</body></html>\n"
             z39 disconnect
             egw_abort
         } elseif {$sessionWait == 0} {
             if {[catch {egw_wait sessionWait 35}]} {
-                displayError "Cannot connect to target ${host}" {}
+                displayError "Cannot connect to target ${thisHost}" {}
                 html "</body></html>\n"
                z39 disconnect
                 egw_abort
             }
             if {$sessionWait != 1} {
-                displayError "Cannot connect to target ${host}" {}
+                displayError "Cannot connect to target ${thisHost}" {}
                 html "</body></html>\n"
                z39 disconnect
                 egw_abort
@@ -73,28 +71,41 @@ proc ok-response {} {
         set sessionWait 0
         z39 idAuthentication $hist($setNo,idAuthentication)
         if {[catch {z39 init}]} {
-            displayError "Cannot initialize target ${host}" {}
+            displayError "Cannot initialize target ${thisHost}" {}
             html "</body></html>\n"
             egw_abort
         }
-        if {[catch {egw_wait sessionWait 60}]} {
-            displayError "Cannot initialize target ${host}" {}
+        if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} {
+            displayError "Cannot initialize target ${thisHost}" {}
             html "</body></html>\n"
             egw_abort
        }       
         if {$sessionWait != "1"} {
-            displayError "Cannot initialize target ${host}" {}
+            displayError "Cannot initialize target ${thisHost}" {}
             html "</body></html>\n"
             egw_abort
         }
         if {![z39 initResult]} {
-            displayError "Connection rejected by target ${host}" \
+            displayError "Connection rejected by target ${thisHost}" \
                  [z39 userInformationField]
             z39 disconnect
             html "</body></html>\n"
             egw_abort
         }
     }
+
+    set useIcons 1
+    button-europagate
+    button-new-target 1
+    if {[lsearch [z39 options] scan] >= 0} {
+        button-scan-window 1 $setNo
+    }
+    button-view-history 0 
+
+    html "<h2>" [lindex $targets($host) 0] "</h2><br>\n"
+
+    html [lindex $targets($host) 4] "<br>\n"
+
     set databases [lindex $targets($host) 1]
 
     if {$initSet == ""} {
@@ -156,9 +167,9 @@ proc ok-response {} {
         if {[string length $template] > 0} {
             html { value="} $template {"}
         }
-        html { size=45> }
+        html { size=43> }
         if {0 && [lsearch [z39 options] scan] >= 0} {
-                html {<input type="checkbox" name="scan} $no {" value="1" scan>}
+            html {<input type="checkbox" name="scan} $no {" value="1" scan>}
         }
         if {$no < 3} {
             html {<select name="logic} $no {">} \n
@@ -191,15 +202,12 @@ proc ok-response {} {
         html 20
     }
     html {" size=4>}
-}
-</form>
-<p>
+    html "</form>\n"
+    html "<p>\n"
 
-{
+    set useIcons 0
     button-europagate
-
     button-new-target 1
-
     if {[lsearch [z39 options] scan] >= 0} {
         button-scan-window 1 $setNo
     }
@@ -227,5 +235,3 @@ proc ok-response {} {
     html "scanTerm: " $scanTerm " <br>\n"
 }
 </body></html>
-
-
Europgate