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.
[egate.git]
/
www
/
query.egw
diff --git
a/www/query.egw
b/www/query.egw
index
a5b874e
..
a8db8ff
100644
(file)
--- a/
www/query.egw
+++ b/
www/query.egw
@@
-4,7
+4,7
@@
</head>
<body>
{
</head>
<body>
{
-# $Id: query.egw,v 1.26 1996/01/08 08:42:15 adam Exp $
+# $Id: query.egw,v 1.28 1996/01/12 13:08:28 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
@@
-140,39
+133,48
@@
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=45> }
+ if {0 && [lsearch [z39 options] scan] >= 0} {
+ html {<input type="checkbox" name="scan} $no {" value="1" scan>}
}
}
+ html "<br>\n"
if {$no < 3} {
if {$no < 3} {
- html {<select name="logic} $no {">} \n
+ html {<center><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 "<option> " [join $op " "] \n
}
- html "</select>\n"
+ html "</select></center>\n"
}
html "<br>\n"
}
}
html "<br>\n"
}
@@
-198,6
+200,10
@@
proc ok-response {} {
button-europagate
button-new-target 1
button-europagate
button-new-target 1
+
+ if {[lsearch [z39 options] scan] >= 0} {
+ button-scan-window 1 $setNo
+ }
button-view-history 0
}
button-view-history 0
}