projects
/
egate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes.
[egate.git]
/
www
/
query.egw
diff --git
a/www/query.egw
b/www/query.egw
index
9a72fe3
..
152af07
100644
(file)
--- a/
www/query.egw
+++ b/
www/query.egw
@@
-4,7
+4,7
@@
</head>
<body>
{
</head>
<body>
{
-# $Id: query.egw,v 1.9 1995/11/06 17:44:20 adam Exp $
+# $Id: query.egw,v 1.12 1995/11/08 18:07:23 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
if {[info commands saveState] == ""} {
source z39util.tcl
@@
-36,36
+36,50
@@
proc ok-response {} {
set setNo 1
}
set hist($setNo,host) $host
set setNo 1
}
set hist($setNo,host) $host
+ set hist($setNo,idAuthentication) [lindex $targets($host) 3]
if {[catch {z39 failback fail-response}]} {
ir z39
}
if {[catch {z39 failback fail-response}]} {
ir z39
}
+
+ html "<h2> Search in " [lindex $targets($host) 0] "</h2>\n"
+
z39 callback ok-response
z39 failback fail-response
if {$host != $oldHost} {
catch {z39 disconnect}
z39 callback ok-response
z39 failback fail-response
if {$host != $oldHost} {
catch {z39 disconnect}
- html "Connecting to target " $host " <br>\n"
set sessionWait 0
if {[catch {z39 connect $host}]} {
html "Cannot connect to target ${host} <br>\n"
html "</body></html>\n"
wabort
} elseif {$sessionWait == 0} {
set sessionWait 0
if {[catch {z39 connect $host}]} {
html "Cannot connect to target ${host} <br>\n"
html "</body></html>\n"
wabort
} elseif {$sessionWait == 0} {
- zwait sessionWait
+ if {[catch {zwait sessionWait 30}]} {
+ html "Cannot connect to target ${host} <br>\n"
+ html "</body></html>\n"
+ z39 disconnect
+ wabort
+ }
if {$sessionWait != 1} {
html "Cannot connect to target ${host} <br>\n"
html "</body></html>\n"
if {$sessionWait != 1} {
html "Cannot connect to target ${host} <br>\n"
html "</body></html>\n"
+ z39 disconnect
wabort
}
}
set sessionWait 0
wabort
}
}
set sessionWait 0
+ z39 idAuthentication $hist($setNo,idAuthentication)
if {[catch {z39 init}]} {
htmlr "Cannot initialize with target ${host} <br>"
htmlr "</body></html>"
wabort
}
if {[catch {z39 init}]} {
htmlr "Cannot initialize with target ${host} <br>"
htmlr "</body></html>"
wabort
}
- zwait sessionWait
+ if {[catch {zwait sessionWait 60}]} {
+ htmlr "Cannot initialize with target ${host} <br>"
+ htmlr "</body></html>"
+ wabort
+ }
if {$sessionWait != "1"} {
htmlr "Cannot initialize with target ${host} <br>"
htmlr "</body></html>"
if {$sessionWait != "1"} {
htmlr "Cannot initialize with target ${host} <br>"
htmlr "</body></html>"
@@
-74,8
+88,7
@@
proc ok-response {} {
}
set databases [lindex $targets($host) 1]
}
set databases [lindex $targets($host) 1]
- html "<h2> Search in databases </h2>\n"
- html {<form action="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
+ html {<form action="http:} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo {" method=post>} \n
set nodb [llength $databases]
if {$nodb > 1} {
html / $sessionId {/search.egw/} $setNo {" method=post>} \n
set nodb [llength $databases]
if {$nodb > 1} {
@@
-123,7
+136,7
@@
proc ok-response {} {
}
<hr><p>
Alternatively you can enter your query in
}
<hr><p>
Alternatively you can enter your query in
-<a href="ccl.html"> CCL </a> here: <br>
+<a href="http://www.dtv.dk/ccl.html"> CCL </a> here: <br>
<input type=text name="cclentry" size=52> <br>
<hr>
<h3> Various technical parameters: </h3> <br>
<input type=text name="cclentry" size=52> <br>
<hr>
<h3> Various technical parameters: </h3> <br>
@@
-137,7
+150,7
@@
Records are shown in:
</select>
<br>
<p>
</select>
<br>
<p>
-<input type="submit" value="Send Query">
+<input type=submit value="Search"><input type=reset value="Reset">
</form>
<hr>
This page is maintained by <a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.
</form>
<hr>
This page is maintained by <a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.
@@
-147,7
+160,7
@@
and will continue to be so until the end of December 1995.</em>
<hr>
{
<hr>
{
- html {<a href="http://} $env(SERVER_NAME) $env(SCRIPT_NAME)
+ html {<a href="http:} $env(SCRIPT_NAME)
html / $sessionId {/targets.egw"> New target </a>}
}
{
html / $sessionId {/targets.egw"> New target </a>}
}
{