Better presentation of records. Query/set number persistent.
[egate.git] / www / query.egw
index 3f0d25f..d07e2c3 100644 (file)
 <html>
+<head>
+<title> WWW/Z39.50 Gateway Query Form</title>
+</head>
+<body>
 {
-# $Id: query.egw,v 1.3 1995/10/27 17:30:15 adam Exp $
+# $Id: query.egw,v 1.7 1995/11/01 16:15:44 adam Exp $
 proc fail-response {} {
     global sessionWait
-    htmlr {Init fail<br>}
-    set sessionWait 0
+    set sessionWait -1
 }
 
-proc init-response {} {
+proc ok-response {} {
     global sessionWait
-    htmlr {Init ok <br>}
-    htmlr {</body>}
-    htmlr {</html>}
-    set sessionWait 0
+    set sessionWait 1
 }
 
-    set t $sessionParms
-    set databases [lindex $targets($t) 1]
-    set sessionWait 1
-    ir z39
+    global setNo
+    global nextSetNo
+    global hist
+
+    set host $sessionParms
+
+    if {[info exists setNo]} {
+        set oldHost $hist($setNo,host)
+    } else {
+        set oldHost ""
+    }
+    set setNo $nextSetNo
+    set hist($setNo,host) $host
+
+    if {[catch {z39 failback fail-response}]} {
+        ir z39
+    }
+    z39 callback ok-response
     z39 failback fail-response
-    z39 connect $t
-    z39 callback init-response
-    z39 init
-}
-<head>
-<title> WWW/Z39.50 Gateway Query Form</title>
-</head>
-<body>
-<h2> Search in databases </h2>
-<h1> <blink> Not Functional Yet </blink> </h1>
-{
+    if {$host != $oldHost} {
+        catch {z39 disconnect}
+
+        html "Connecting to target " $host " <br>\n"
+        set sessionWait 0
+        if {[catch {z39 connect $host}]} {
+            html "Cannot connect to target ${host} <br>\n" 
+            html "</body></html>\n"
+            wabort
+        } elseif {$sessionWait == 0} {
+            zwait sessionWait
+            if {$sessionWait != 1} {
+                html "Cannot connect to target ${host} <br>\n"
+                html "</body></html>\n"
+                wabort
+            }
+        }
+        set sessionWait 0
+        z39 init
+        zwait sessionWait
+        if {$sessionWait != "1"} {
+            htmlr "Cannot initialize with target ${host} <br>"
+            htmlr "</body></html>"
+            wabort
+        }
+    }
+    set databases [lindex $targets($host) 1]
+
+    html "<h2> Search in databases </h2>\n"
     html {<form action="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
-    htmlr / $sessionId {/search.egw" method=post>}
+    html / $sessionId {/search.egw/} $setNo {" method=post>} \n
     set nodb [llength $databases]
     if {$nodb > 1} {
         if {$nodb > 2} {
-            htmlr {The chosen target supports searching in several databases. <br>}
-            htmlr {Choose the bases you want to search: <br>}
+            html "The chosen target supports searching in "
+            html "several databases. <br>\n"
+            html "Choose the bases you want to search: <br>\n"
         }
         set i 0
         foreach d $databases {
             html {<input type="checkbox" name="base" value="} $d 
             if {[incr i] > 1} {
-                htmlr {"> } $d
+                html {"> } $d \n
             } else {
-                htmlr {" checked> } $d
+                html {" checked> } $d \n
             }
         }
-        htmlr {<br>}
+        html "<br>\n"
         if {$nodb > 2} {
             html {<input type="checkbox" name="base" value="} 
-            htmlr [concat $databases] {"> All <br>}
+            html [concat $databases] {"> All <br>} \n
         }
     }
 }
 <hr>
 <strong>Input your search criteria: </strong> <br>
 {
-    set fields [lindex $targets($t) 2]
+    set fields [lindex $targets($host) 2]
     for {set no 1} {$no < 4} {incr no} {
-        htmlr {<select name="menu} $no {">}
+        html {<select name="menu} $no {">} \n
         foreach f $fields {
-            htmlr {<option> } [lindex $f 0]
+            html {<option> } [lindex $f 0] \n
         }
-        htmlr </select>
-        htmlr {<input type="text" name="entry} $no {" size=30>}
+        html "</select>\n"
+        html {<input type="text" name="entry} $no {" size=30>} \n
         if {$no < 3} {
-            htmlr {<select name="logic} $no {">}
-            htmlr {<option> And}
-            htmlr {<option> Or}
-            htmlr {<option> And not}
-            htmlr {</select>}
+            html {<select name="logic} $no {">} \n
+            html "<option> And\n"
+            html "<option> Or\n"
+            html "<option> And not\n"
+            html "</select>\n"
         }
-        htmlr <br>
+        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=60> <br>
+<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>
 <strong> Various technical parameters: </strong> <br>
 Max hits: <input type="text" name="hits" value="50" size=3>
@@ -97,16 +130,28 @@ Records are shown in:
 <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>
+<em> This and the following pages are under construction
+and will continue to be so until the end of December 1995.</em>
 <hr>
-sessionId: {html $sessionId} <br>
-sessionParms: {html $sessionParms} <br>
+
 {
+    html {<a href="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
+    html / $sessionId {/targets.egw"> New target </a>}
+}
+{
+    html "<hr>\n"
+    html "<strong>Debug information</strong><br>\n"
+    html "sessionId: $sessionId <br>\n"
+    html "sessionParms: $sessionParms <br>\n"
     foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
-        htmlr $e {: } $env($e) {<br>}
+        html $e {: } $env($e) {<br>} \n
     }
+    html "form: " [wform] " <br>\n"
+    html "target: " $host " <br>\n"
+    html "databases: " $databases " <br>\n"
+    html "setNo: " $setNo " <br>\n"
+    html "nextSetNo: " $nextSetNo " <br>\n"
 }
-form: {html [form]} <br>
-target: {html $t} <br>
-databases: {html $databases} <br>
+</body></html>
+
+