Bug fix: shell might terminate even though new request was initiated
[egate.git] / www / query.egw
index 8f816be..e922e29 100644 (file)
@@ -4,7 +4,7 @@
 </head>
 <body>
 {
-# $Id: query.egw,v 1.10 1995/11/08 12:42:17 adam Exp $
+# $Id: query.egw,v 1.19 1995/12/20 16:31:31 adam Exp $
 
     if {[info commands saveState] == ""} {
         source z39util.tcl
@@ -26,15 +26,14 @@ proc ok-response {} {
 
     set host [lindex $sessionParms 0]
 
-    if {[info exists setNo]} {
-        set oldHost $hist($setNo,host)
-    } else {
-        set oldHost ""
-    }
     if {[catch {set setNo $nextSetNo}]} {
         set nextSetNo 1
         set setNo 1
     }
+    if {[catch {set oldHost [z39 connect]}]} {
+        set oldHost ""
+    }
+
     set hist($setNo,host) $host
     set hist($setNo,idAuthentication) [lindex $targets($host) 3]
 
@@ -42,7 +41,8 @@ proc ok-response {} {
         ir z39
     }
 
-    html "<h2> Search in " [lindex $targets($host) 0] "</h2>\n"
+    html {<h2><img src="/gif/button-egw.gif" border=0 align=middle>}
+    html " Search in " [lindex $targets($host) 0] "</h2>\n"
 
     z39 callback ok-response
     z39 failback fail-response
@@ -51,34 +51,60 @@ proc ok-response {} {
 
         set sessionWait 0
         if {[catch {z39 connect $host}]} {
-            html "Cannot connect to target ${host} <br>\n" 
+            displayError "Cannot connect to target ${host}" {}
             html "</body></html>\n"
+            z39 disconnect
             wabort
         } elseif {$sessionWait == 0} {
-            zwait sessionWait
+            if {[catch {zwait sessionWait 30}]} {
+                displayError "Cannot connect to target ${host}" {}
+                html "</body></html>\n"
+               z39 disconnect
+                wabort
+            }
             if {$sessionWait != 1} {
-                html "Cannot connect to target ${host} <br>\n"
+                displayError "Cannot connect to target ${host}" {}
                 html "</body></html>\n"
+               z39 disconnect
                 wabort
             }
         }
         set sessionWait 0
         z39 idAuthentication $hist($setNo,idAuthentication)
         if {[catch {z39 init}]} {
-            htmlr "Cannot initialize with target ${host} <br>"
-            htmlr "</body></html>"
+            displayError "Cannot initialize target ${host}" {}
+            html "</body></html>\n"
             wabort
         }
-        zwait sessionWait
+        if {[catch {zwait sessionWait 60}]} {
+            displayError "Cannot initialize target ${host}" {}
+            html "</body></html>\n"
+            wabort
+       }       
         if {$sessionWait != "1"} {
-            htmlr "Cannot initialize with target ${host} <br>"
+            displayError "Cannot initialize target ${host}" {}
+            htmlr "</body></html>\n"
+            wabort
+        }
+        if {![z39 initResult]} {
+            displayError "Connection rejected by target ${host}" \
+                 [z39 userInformationField]
+            z39 disconnect
             htmlr "</body></html>"
             wabort
         }
     }
     set databases [lindex $targets($host) 1]
 
-    html {<form action="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
+    if {$setNo > 1 && $hist([expr $setNo - 1],host) == $host} {
+        set oSetNo [expr $setNo - 1]
+        set databaseDefault $hist($oSetNo,database)
+    } else {
+        set databaseDefault [lindex $databases 0]
+        set oSetNo 0
+    }
+
+    html {<form action="http:} $env(SCRIPT_NAME)
     html / $sessionId {/search.egw/} $setNo {" method=post>} \n
     set nodb [llength $databases]
     if {$nodb > 1} {
@@ -90,7 +116,7 @@ proc ok-response {} {
         set i 0
         foreach d $databases {
             html {<input type="checkbox" name="base" value="} $d 
-            if {[incr i] > 1} {
+            if {[lsearch $databaseDefault $d] == -1} {
                 html {"> } $d \n
             } else {
                 html {" checked> } $d \n
@@ -98,62 +124,76 @@ proc ok-response {} {
         }
         html "<br>\n"
         if {$nodb > 2} {
-            html {<input type="checkbox" name="base" value="} 
+            html {<input type="checkbox" name="baseall" value="} 
             html [concat $databases] {"> All <br>} \n
         }
+        html "Input your search criteria:<br>\n"
     }
 }
-<hr>
-<h3>Input your search criteria: </h3> <br>
 {
     set fields [lindex $targets($host) 2]
     for {set no 1} {$no < 4} {incr no} {
         html {<select name="menu} $no {">} \n
+        if {$oSetNo > 0} {
+            html {<option> } $hist($oSetNo,form,menu$no) \n
+        }
         foreach f $fields {
-            html {<option> } [lindex $f 0] \n
+            set name [lindex $f 0]
+            if {$oSetNo > 0} {
+                if {$hist($oSetNo,form,menu$no) == $name} continue
+            }
+            html {<option> } $name \n
         }
         html "</select>\n"
-        html {<input type="text" name="entry} $no {" size=30>} \n
+        html {<input type="text" name="entry} $no {"}
+        html { size=30>} \n
         if {$no < 3} {
             html {<select name="logic} $no {">} \n
-            html "<option> And\n"
-            html "<option> Or\n"
-            html "<option> And not\n"
+            if {$oSetNo > 0} {
+                html "<option> " $hist($oSetNo,form,logic$no) \n
+            }
+            foreach op {And Or {And not}} {
+                if {$oSetNo > 0} {
+                    if {$hist($oSetNo,form,logic$no) == $op} continue
+                }
+                html "<option> " $op \n
+            }
             html "</select>\n"
         }
         html "<br>\n"
     }
 }
-<hr><p>
-Alternatively you can enter your query in
-<a href="ccl.html"> CCL </a> here: <br>
-<input type=text name="cclentry" size=52> <br>
-<hr>
-<h3> Various technical parameters: </h3> <br>
-Max hits: <input type="text" name="hits" value="10" size=3>
-Records are shown in:
-<select name="format">
-<option> Long format
-<option> Medium format
-<option> Short format
-<option> Raw MARC
-</select>
+
+<input type=submit value="Search"><input type=reset value="Reset">
+<br>
+{
+    html {Number of records to display in the result set list: }
+    html {<input type="text" name="hits" value="}
+    if {$oSetNo > 0} {
+        html $hist($oSetNo,maxPresent)
+    } else {
+        html 20
+    }
+    html {" size=3>}
+}
 <br>
 <p>
-<input type="submit" value="Send Query">
 </form>
+
+{
+    html {<img src="/gif/button-egw.gif" border=0></a>}
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/targets.egw}
+    html {"><img src="/gif/button-new-target.gif" border=0></a>}
+}
+
 <hr>
 This page is maintained by <a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.
 Last modified 29. september 1995. <br>
 <em> This and the following pages are under construction
 and will continue to be so until the end of December 1995.</em>
-<hr>
 
 {
-    html {<a href="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
-    html / $sessionId {/targets.egw"> New target </a>}
-}
-{
     html "<hr>\n"
     html "<h3>Debug information</h3>\n"
     html "sessionId: $sessionId <br>\n"