projects
/
egate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More work on target definitons.
[egate.git]
/
www
/
query.egw
diff --git
a/www/query.egw
b/www/query.egw
index
cad8e7a
..
632f35e
100644
(file)
--- a/
www/query.egw
+++ b/
www/query.egw
@@
-4,7
+4,7
@@
</head>
<body>
{
</head>
<body>
{
-# $Id: query.egw,v 1.27 1996/01/12 10:03:17 adam Exp $
+# $Id: query.egw,v 1.31 1996/01/24 16:59:28 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
if {[info commands saveState] == ""} {
source z39util.tcl
@@
-44,55
+44,56
@@
proc ok-response {} {
ir z39
}
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
z39 callback ok-response
z39 failback fail-response
- if {$host != $oldHost} {
+ set thisHost [splitHostSpec $host]
+ if {$thisHost != $oldHost} {
catch {z39 disconnect}
set sessionWait 0
catch {z39 disconnect}
set sessionWait 0
- if {[catch {z39 connect $host}]} {
- displayError "Cannot connect to target ${host}" {}
+ if {[catch {z39 connect $thisHost}]} {
+ displayError "Cannot connect to target ${thisHost}" {}
html "</body></html>\n"
z39 disconnect
html "</body></html>\n"
z39 disconnect
- wabort
+ egw_abort
} elseif {$sessionWait == 0} {
} elseif {$sessionWait == 0} {
- if {[catch {zwait sessionWait 35}]} {
- displayError "Cannot connect to target ${host}" {}
+ if {[catch {egw_wait sessionWait 35}]} {
+ displayError "Cannot connect to target ${thisHost}" {}
html "</body></html>\n"
z39 disconnect
html "</body></html>\n"
z39 disconnect
- wabort
+ egw_abort
}
if {$sessionWait != 1} {
}
if {$sessionWait != 1} {
- displayError "Cannot connect to target ${host}" {}
+ displayError "Cannot connect to target ${thisHost}" {}
html "</body></html>\n"
z39 disconnect
html "</body></html>\n"
z39 disconnect
- wabort
+ egw_abort
}
}
set sessionWait 0
z39 idAuthentication $hist($setNo,idAuthentication)
if {[catch {z39 init}]} {
}
}
set sessionWait 0
z39 idAuthentication $hist($setNo,idAuthentication)
if {[catch {z39 init}]} {
- displayError "Cannot initialize target ${host}" {}
+ displayError "Cannot initialize target ${thisHost}" {}
html "</body></html>\n"
html "</body></html>\n"
- wabort
+ egw_abort
}
}
- if {[catch {zwait sessionWait 60}]} {
- displayError "Cannot initialize target ${host}" {}
+ if {[catch {egw_wait sessionWait 60}]} {
+ displayError "Cannot initialize target ${thisHost}" {}
html "</body></html>\n"
html "</body></html>\n"
- wabort
+ egw_abort
}
if {$sessionWait != "1"} {
}
if {$sessionWait != "1"} {
- displayError "Cannot initialize target ${host}" {}
- htmlr "</body></html>\n"
- wabort
+ displayError "Cannot initialize target ${thisHost}" {}
+ html "</body></html>\n"
+ egw_abort
}
if {![z39 initResult]} {
}
if {![z39 initResult]} {
- displayError "Connection rejected by target ${host}" \
+ displayError "Connection rejected by target ${thisHost}" \
[z39 userInformationField]
z39 disconnect
[z39 userInformationField]
z39 disconnect
- htmlr "</body></html>"
- wabort
+ html "</body></html>\n"
+ egw_abort
}
}
set databases [lindex $targets($host) 1]
}
}
set databases [lindex $targets($host) 1]
@@
-128,8
+129,8
@@
proc ok-response {} {
html {<input type="checkbox" name="baseall" value="}
html [concat $databases] {"> All <br>} \n
}
html {<input type="checkbox" name="baseall" value="}
html [concat $databases] {"> All <br>} \n
}
- html "Input your search criteria:<br>\n"
}
}
+ 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 fields [lindex $targets($host) 2]
for {set no 1} {$no < 4} {incr no} {
html {<select name="menu} $no {">} \n
@@
-156,11
+157,10
@@
proc ok-response {} {
if {[string length $template] > 0} {
html { value="} $template {"}
}
if {[string length $template] > 0} {
html { value="} $template {"}
}
- html { size=35> }
- if {[lsearch [z39 options] scan] >= 0} {
+ html { size=43> }
+ if {0 && [lsearch [z39 options] scan] >= 0} {
html {<input type="checkbox" name="scan} $no {" value="1" scan>}
}
html {<input type="checkbox" name="scan} $no {" value="1" scan>}
}
- html "<br>\n"
if {$no < 3} {
html {<select name="logic} $no {">} \n
set template {}
if {$no < 3} {
html {<select name="logic} $no {">} \n
set template {}
@@
-200,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
}
@@
-214,7
+218,7
@@
proc ok-response {} {
foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
html $e {: } $env($e) {<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 "target: " $host " <br>\n"
html "databases: " $databases " <br>\n"
html "setNo: " $setNo " <br>\n"