projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More work on target definitons.
[egate.git] / www / query.egw
diff --git a/www/query.egw b/www/query.egw
index 698c861..632f35e 100644 (file)
--- a/www/query.egw
+++ b/www/query.egw
@@ -4,7 +4,7 @@
 </head>
 <body>
 {
-# $Id: query.egw,v 1.29 1996/01/24 08:27:28 adam Exp $
+# $Id: query.egw,v 1.31 1996/01/24 16:59:28 adam Exp $
 
     if {[info commands saveState] == ""} {
         source z39util.tcl
@@ -47,24 +47,25 @@ proc ok-response {} {
     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 {$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,22 +74,22 @@ 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}" {}
+            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"
@@ -128,8 +129,8 @@ proc ok-response {} {
             html {<input type="checkbox" name="baseall" value="} 
             html [concat $databases] {"> All <br>} \n
         }
-        html "Input your search criteria:<br>\n"
     }
+    html "Input your search criteria:<br>\n"
     set fields [lindex $targets($host) 2]
     for {set no 1} {$no < 4} {incr no} {
         html {<select name="menu} $no {">} \n
@@ -156,13 +157,12 @@ 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>}
         }
-        html "<br>\n"
         if {$no < 3} {
-            html {<center><select name="logic} $no {">} \n
+            html {<select name="logic} $no {">} \n
             set template {}
             if {$oSetNo > 0} {
                 set template [join $hist($oSetNo,form,logic$no) " "]
@@ -174,7 +174,7 @@ proc ok-response {} {
                 if {$template == $op} continue
                 html "<option> " [join $op " "] \n
             }
-            html "</select></center>\n"
+            html "</select>\n"
         }
         html "<br>\n"
     }
Europgate