Lots of changes. They aren't visible though.
[egate.git] / www / query.egw
index d07e2c3..d2280ab 100644 (file)
@@ -4,7 +4,12 @@
 </head>
 <body>
 {
-# $Id: query.egw,v 1.7 1995/11/01 16:15:44 adam Exp $
+# $Id: query.egw,v 1.35 1996/03/07 12:46:08 adam Exp $
+
+    if {[info commands saveState] == ""} {
+        source z39util.tcl
+    }
+
 proc fail-response {} {
     global sessionWait
     set sessionWait -1
@@ -19,52 +24,100 @@ proc ok-response {} {
     global nextSetNo
     global hist
 
-    set host $sessionParms
+    set host [lindex $sessionParms 0]
+    set initSet [lindex $sessionParms 1]
+    set scanLine [lindex $sessionParms 2]
+    set scanTerm [lrange $sessionParms 3 end]
 
-    if {[info exists setNo]} {
-        set oldHost $hist($setNo,host)
-    } else {
+    if {[catch {set setNo $nextSetNo}]} {
+        set nextSetNo 1
+        set setNo 1
+    }
+    if {[catch {set oldHost [z390 connect]}]} {
         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
-    if {$host != $oldHost} {
-        catch {z39 disconnect}
+    set hist($setNo,0,host) $host
+    set hist($setNo,0,idAuthentication) [lindex $targets($host) 3]
+
+    mkAssoc z390 $host
+
+    z390 callback ok-response
+    z390 failback fail-response
+    set thisHost [splitHostSpec $host]
+    if {[string compare $thisHost $oldHost]} {
+        catch {z390 disconnect}
 
-        html "Connecting to target " $host " <br>\n"
         set sessionWait 0
-        if {[catch {z39 connect $host}]} {
-            html "Cannot connect to target ${host} <br>\n" 
+        if {[catch {z390 connect $thisHost}]} {
+            displayError "Cannot connect to target ${thisHost}" {}
             html "</body></html>\n"
-            wabort
+            z390 disconnect
+            egw_abort
         } elseif {$sessionWait == 0} {
-            zwait sessionWait
+            if {[catch {egw_wait sessionWait 35}]} {
+                displayError "Cannot connect to target ${thisHost}" {}
+                html "</body></html>\n"
+               z390 disconnect
+                egw_abort
+            }
             if {$sessionWait != 1} {
-                html "Cannot connect to target ${host} <br>\n"
+                displayError "Cannot connect to target ${thisHost}" {}
                 html "</body></html>\n"
-                wabort
+               z390 disconnect
+                egw_abort
             }
         }
         set sessionWait 0
-        z39 init
-        zwait sessionWait
+        z390 idAuthentication $hist($setNo,0,idAuthentication)
+        if {[catch {z390 init}]} {
+            displayError "Cannot initialize target ${thisHost}" {}
+            html "</body></html>\n"
+            egw_abort
+        }
+        if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} {
+            displayError "Cannot initialize target ${thisHost}" {}
+            html "</body></html>\n"
+            egw_abort
+       }       
         if {$sessionWait != "1"} {
-            htmlr "Cannot initialize with target ${host} <br>"
-            htmlr "</body></html>"
-            wabort
+            displayError "Cannot initialize target ${thisHost}" {}
+            html "</body></html>\n"
+            egw_abort
+        }
+        if {![z390 initResult]} {
+            displayError "Connection rejected by target ${thisHost}" \
+                 [z390 userInformationField]
+            z390 disconnect
+            html "</body></html>\n"
+            egw_abort
         }
     }
+
+    set useIcons 1
+    button-europagate
+    button-new-target 1
+    if {[lsearch [z390 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]
 
-    html "<h2> Search in databases </h2>\n"
-    html {<form action="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
-    html / $sessionId {/search.egw/} $setNo {" method=post>} \n
+    if {$initSet == ""} {
+        set databaseDefault [lindex $databases 0]
+        set oSetNo 0
+    } else {
+        set oSetNo $initSet
+        set databaseDefault $hist($oSetNo,0,database)
+    }
+    
+    html {<form action="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/search.egw/} $setNo + 0 {" method=get>} \n
     set nodb [llength $databases]
     if {$nodb > 1} {
         if {$nodb > 2} {
@@ -75,7 +128,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
@@ -83,75 +136,102 @@ 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
         }
     }
-}
-<hr>
-<strong>Input your search criteria: </strong> <br>
-{
+    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
+        set template {}
+        if {$oSetNo > 0} {
+            set template [join $hist($oSetNo,form,menu$no)]
+        }
+        if {[string length $template] > 0} {
+            html {<option> } $template "\n"
+        }
         foreach f $fields {
-            html {<option> } [lindex $f 0] \n
+            set name [lindex $f 0]
+            if {$template == $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 {"}
+        set template {}
+        if {$scanLine == $no} {
+            set template [join $scanTerm " "] 
+        } elseif {[info exists hist($oSetNo,form,entry$no)]} {
+            set template [join $hist($oSetNo,form,entry$no) " "]
+        }
+        if {[string length $template] > 0} {
+            html { value="} $template {"}
+        }
+        html { size=43> }
+        if {0 && [lsearch [z390 options] scan] >= 0} {
+            html {<input type="checkbox" name="scan} $no {" value="1" scan>}
+        }
         if {$no < 3} {
             html {<select name="logic} $no {">} \n
-            html "<option> And\n"
-            html "<option> Or\n"
-            html "<option> And not\n"
+            set template {}
+            if {$oSetNo > 0} {
+                set template [join $hist($oSetNo,form,logic$no) " "]
+            }
+            if {[string length $template] > 0} {
+                html "<option> " $template \n
+            }
+            foreach op {And Or {And not}} {
+                if {$template == $op} continue
+                html "<option> " [join $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>
-<strong> Various technical parameters: </strong> <br>
-Max hits: <input type="text" name="hits" value="50" size=3>
-Records are shown in:
-<select name="format">
-<option> Long format
-<option> Medium format
-<option> Short format
-<option> Raw MARC
-</select>
-<br>
-<p>
-<input type="submit" value="Send Query">
-</form>
-<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>
 
+<input type=submit name=submit value="Search">
+<input type=reset value="Reset">
+<br>
 {
-    html {<a href="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
-    html / $sessionId {/targets.egw"> New target </a>}
+    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=4>}
+    html "</form>\n"
+    html "<p>\n"
+
+    set useIcons 0
+    button-europagate
+    button-new-target 1
+    if {[lsearch [z390 options] scan] >= 0} {
+        button-scan-window 1 $setNo
+    }
+    button-view-history 0 
 }
+
 {
+    catch maintenance
+    global debug
+    if {!$debug} return
     html "<hr>\n"
-    html "<strong>Debug information</strong><br>\n"
+    html "<h3>Debug information</h3>\n"
     html "sessionId: $sessionId <br>\n"
     html "sessionParms: $sessionParms <br>\n"
     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"
     html "nextSetNo: " $nextSetNo " <br>\n"
+    html "initSet: " $initSet " <br>\n"
+    html "scanLine: " $scanLine " <br>\n"
+    html "scanTerm: " $scanTerm " <br>\n"
 }
 </body></html>
-
-