projects
/
egate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work on scan window.
[egate.git]
/
www
/
query.egw
diff --git
a/www/query.egw
b/www/query.egw
index
92e2e1d
..
cad8e7a
100644
(file)
--- a/
www/query.egw
+++ b/
www/query.egw
@@
-4,7
+4,7
@@
</head>
<body>
{
</head>
<body>
{
-# $Id: query.egw,v 1.25 1996/01/04 10:40:00 adam Exp $
+# $Id: query.egw,v 1.27 1996/01/12 10:03:17 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
if {[info commands saveState] == ""} {
source z39util.tcl
@@
-97,13
+97,6
@@
proc ok-response {} {
}
set databases [lindex $targets($host) 1]
}
set databases [lindex $targets($host) 1]
-# if {[catch {set prevHost $hist([expr $setNo - 1],host)}]} {
-# set databaseDefault [lindex $databases 0]
-# set oSetNo 0
-# } else {
-# set oSetNo [expr $setNo - 1]
-# set databaseDefault $hist($oSetNo,database)
-# }
if {$initSet == ""} {
set databaseDefault [lindex $databases 0]
set oSetNo 0
if {$initSet == ""} {
set databaseDefault [lindex $databases 0]
set oSetNo 0
@@
-113,7
+106,7
@@
proc ok-response {} {
}
html {<form action="http:} $env(SCRIPT_NAME)
}
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} {
set nodb [llength $databases]
if {$nodb > 1} {
if {$nodb > 2} {
@@
-140,36
+133,45
@@
proc ok-response {} {
set fields [lindex $targets($host) 2]
for {set no 1} {$no < 4} {incr no} {
html {<select name="menu} $no {">} \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} {
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]
}
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 {<option> } $name \n
}
html "</select>\n"
html {<input type="text" name="entry} $no {"}
+ set template {}
if {$scanLine == $no} {
if {$scanLine == $no} {
- html { value="} [join $scanTerm " "] {"}
+ set template [join $scanTerm " "]
} elseif {[info exists hist($oSetNo,form,entry$no)]} {
} elseif {[info exists hist($oSetNo,form,entry$no)]} {
- html { value="} [join $hist($oSetNo,form,entry$no) " "] {"}
+ set template [join $hist($oSetNo,form,entry$no) " "]
+ }
+ if {[string length $template] > 0} {
+ html { value="} $template {"}
}
html { size=35> }
if {[lsearch [z39 options] scan] >= 0} {
html {<input type="checkbox" name="scan} $no {" value="1" scan>}
}
}
html { size=35> }
if {[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
if {$no < 3} {
html {<select name="logic} $no {">} \n
+ set template {}
if {$oSetNo > 0} {
if {$oSetNo > 0} {
- html "<option> " [join $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}} {
}
foreach op {And Or {And not}} {
- if {$oSetNo > 0} {
- if {$hist($oSetNo,form,logic$no) == $op} continue
- }
+ if {$template == $op} continue
html "<option> " [join $op " "] \n
}
html "</select>\n"
html "<option> " [join $op " "] \n
}
html "</select>\n"