projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Modified to use egw_-commands.
[egate.git] / www / query.egw
diff --git a/www/query.egw b/www/query.egw
index a8db8ff..698c861 100644 (file)
--- a/www/query.egw
+++ b/www/query.egw
@@ -4,7 +4,7 @@
 </head>
 <body>
 {
-# $Id: query.egw,v 1.28 1996/01/12 13:08:28 adam Exp $
+# $Id: query.egw,v 1.29 1996/01/24 08:27:28 adam Exp $
 
     if {[info commands saveState] == ""} {
         source z39util.tcl
@@ -44,7 +44,7 @@ proc ok-response {} {
         ir z39
     }
 
-    html "<h2>Search in " [lindex $targets($host) 0] "</h2>\n"
+    html "<h2>Search in " [lindex $targets($host) 0] "</h2><br>\n"
     z39 callback ok-response
     z39 failback fail-response
     if {$host != $oldHost} {
@@ -55,19 +55,19 @@ proc ok-response {} {
             displayError "Cannot connect to target ${host}" {}
             html "</body></html>\n"
             z39 disconnect
-            wabort
+            egw_abort
         } elseif {$sessionWait == 0} {
-            if {[catch {zwait sessionWait 35}]} {
+            if {[catch {egw_wait sessionWait 35}]} {
                 displayError "Cannot connect to target ${host}" {}
                 html "</body></html>\n"
                z39 disconnect
-                wabort
+                egw_abort
             }
             if {$sessionWait != 1} {
                 displayError "Cannot connect to target ${host}" {}
                 html "</body></html>\n"
                z39 disconnect
-                wabort
+                egw_abort
             }
         }
         set sessionWait 0
@@ -75,24 +75,24 @@ proc ok-response {} {
         if {[catch {z39 init}]} {
             displayError "Cannot initialize target ${host}" {}
             html "</body></html>\n"
-            wabort
+            egw_abort
         }
-        if {[catch {zwait sessionWait 60}]} {
+        if {[catch {egw_wait sessionWait 60}]} {
             displayError "Cannot initialize target ${host}" {}
             html "</body></html>\n"
-            wabort
+            egw_abort
        }       
         if {$sessionWait != "1"} {
             displayError "Cannot initialize target ${host}" {}
-            htmlr "</body></html>\n"
-            wabort
+            html "</body></html>\n"
+            egw_abort
         }
         if {![z39 initResult]} {
             displayError "Connection rejected by target ${host}" \
                  [z39 userInformationField]
             z39 disconnect
-            htmlr "</body></html>"
-            wabort
+            html "</body></html>\n"
+            egw_abort
         }
     }
     set databases [lindex $targets($host) 1]
@@ -218,7 +218,7 @@ proc ok-response {} {
     foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
         html $e {: } $env($e) {<br>} \n
     }
-    html "form: " [wform] " <br>\n"
+    html "form: " [egw_form] " <br>\n"
     html "target: " $host " <br>\n"
     html "databases: " $databases " <br>\n"
     html "setNo: " $setNo " <br>\n"
Europgate