</head>
<body>
{
-# $Id: query.egw,v 1.21 1996/01/02 10:52:26 adam Exp $
+# $Id: query.egw,v 1.29 1996/01/24 08:27:28 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
global hist
set host [lindex $sessionParms 0]
+ set initSet [lindex $sessionParms 1]
+ set scanLine [lindex $sessionParms 2]
+ set scanTerm [lrange $sessionParms 3 end]
if {[catch {set setNo $nextSetNo}]} {
set nextSetNo 1
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} {
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
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]
- if {[catch {set prevHost $hist([expr $setNo - 1],host)}]} {
+ if {$initSet == ""} {
set databaseDefault [lindex $databases 0]
set oSetNo 0
} else {
- set oSetNo [expr $setNo - 1]
+ set oSetNo $initSet
set databaseDefault $hist($oSetNo,database)
}
+
html {<form action="http:} $env(SCRIPT_NAME)
- html / $sessionId {/search.egw/} $setNo {" method=post>} \n
+ html / $sessionId {/search.egw/} $setNo {" method=get>} \n
set nodb [llength $databases]
if {$nodb > 1} {
if {$nodb > 2} {
}
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} {
- html {<option> } $hist($oSetNo,form,menu$no) \n
+ set template [join $hist($oSetNo,form,menu$no)]
+ }
+ if {[string length $template] > 0} {
+ html {<option> } $template "\n"
}
foreach f $fields {
set name [lindex $f 0]
- if {$oSetNo > 0} {
- if {$hist($oSetNo,form,menu$no) == $name} continue
- }
+ if {$template == $name} continue
html {<option> } $name \n
}
html "</select>\n"
html {<input type="text" name="entry} $no {"}
- html { size=35>} \n
+ 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=45> }
+ if {0 && [lsearch [z39 options] scan] >= 0} {
+ html {<input type="checkbox" name="scan} $no {" value="1" scan>}
+ }
+ html "<br>\n"
if {$no < 3} {
- html {<select name="logic} $no {">} \n
+ html {<center><select name="logic} $no {">} \n
+ set template {}
if {$oSetNo > 0} {
- html "<option> " $hist($oSetNo,form,logic$no) \n
+ set template [join $hist($oSetNo,form,logic$no) " "]
+ }
+ if {[string length $template] > 0} {
+ html "<option> " $template \n
}
foreach op {And Or {And not}} {
- if {$oSetNo > 0} {
- if {$hist($oSetNo,form,logic$no) == $op} continue
- }
- html "<option> " $op \n
+ if {$template == $op} continue
+ html "<option> " [join $op " "] \n
}
- html "</select>\n"
+ html "</select></center>\n"
}
html "<br>\n"
}
}
<input type=submit name=submit value="Search">
-<input type=submit name=submit value="Scan">
<input type=reset value="Reset">
<br>
{
} else {
html 20
}
- html {" size=3>}
+ html {" size=4>}
}
</form>
<p>
{
- html {<img src="/gif/button-egw.gif" alt="Europagate" border=0></a>}
- html {<a href="http:} $env(SCRIPT_NAME)
- html / $sessionId {/targets.egw}
- html {"><img src="/gif/button-new-target.gif" alt="New Target" }
- html {border=0 alt="New Target"></a>}
-}
+ button-europagate
+
+ button-new-target 1
-<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>
+ if {[lsearch [z39 options] scan] >= 0} {
+ button-scan-window 1 $setNo
+ }
+ button-view-history 0
+}
{
+ catch maintenance
+ global debug
+ if {!$debug} return
html "<hr>\n"
html "<h3>Debug information</h3>\n"
html "sessionId: $sessionId <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>