# Europagate, 1995
#
# $Log: Makefile,v $
-# Revision 1.14 1995/11/13 15:41:40 adam
+# Revision 1.15 1995/11/13 18:17:46 adam
+# Better error handling.
+#
+# Revision 1.14 1995/11/13 15:41:40 adam
# Arrow gifs.
# Gateway uses record element set names B(rief) and F(ull).
# Bug fix. Didn't save idAuthentication correctly.
mtargets.egw mquery.egw msearch.egw
HSCRIPTS=egwindex.html
CONFFILES=ztargets.conf
-GIFFILES=webgate.gif darrw.gif uarrw.gif
+GIFFILES=webgate.gif darrw.gif uarrw.gif noway.gif
TPROG1=egwcgi
TPROG2=egwsh
TPROG3=wtest
</head>
<body>
{
-# $Id: query.egw,v 1.15 1995/11/13 15:41:42 adam Exp $
+# $Id: query.egw,v 1.16 1995/11/13 18:17:47 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
set host [lindex $sessionParms 0]
- if {[info exists setNo]} {
- set oldHost $hist($setNo,host)
- } else {
- set oldHost ""
- }
if {[catch {set setNo $nextSetNo}]} {
set nextSetNo 1
set setNo 1
}
+ if {[catch {set oldHost [z39 connect]}]} {
+ set oldHost ""
+ }
+
set hist($setNo,host) $host
set hist($setNo,idAuthentication) [lindex $targets($host) 3]
set sessionWait 0
if {[catch {z39 connect $host}]} {
- html "Cannot connect to target ${host} <br>\n"
+ displayError "Cannot connect to target ${host}" {}
html "</body></html>\n"
+ z39 disconnect
wabort
} elseif {$sessionWait == 0} {
if {[catch {zwait sessionWait 30}]} {
- html "Cannot connect to target ${host} <br>\n"
+ displayError "Cannot connect to target ${host}" {}
html "</body></html>\n"
z39 disconnect
wabort
}
if {$sessionWait != 1} {
- html "Cannot connect to target ${host} <br>\n"
+ displayError "Cannot connect to target ${host}" {}
html "</body></html>\n"
z39 disconnect
wabort
}
}
set sessionWait 0
-# z39 idAuthentication $hist($setNo,idAuthentication)
+ z39 idAuthentication $hist($setNo,idAuthentication)
if {[catch {z39 init}]} {
- htmlr "Cannot initialize with target ${host} <br>"
- htmlr "</body></html>"
+ displayError "Cannot initialize target ${host}" {}
+ html "</body></html>\n"
wabort
}
if {[catch {zwait sessionWait 60}]} {
- htmlr "Cannot initialize with target ${host} <br>"
- htmlr "</body></html>"
+ displayError "Cannot initialize target ${host}" {}
+ html "</body></html>\n"
wabort
}
if {$sessionWait != "1"} {
- htmlr "Cannot initialize with target ${host} <br>"
+ displayError "Cannot initialize target ${host}" {}
+ htmlr "</body></html>\n"
+ wabort
+ }
+ if {![z39 initResult]} {
+ displayError "Connection rejected by target ${host}" \
+ [z39 userInformationField]
+ z39 disconnect
htmlr "</body></html>"
wabort
}
}
set databases [lindex $targets($host) 1]
+ if {$setNo > 1 && $hist([expr $setNo - 1],host) == $host} {
+ set oSetNo [expr $setNo - 1]
+ set databaseDefault $hist($oSetNo,database)
+ } else {
+ set databaseDefault [lindex $databases 0]
+ set oSetNo 0
+ }
+
html {<form action="http:} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo {" method=post>} \n
set nodb [llength $databases]
set i 0
foreach d $databases {
html {<input type="checkbox" name="base" value="} $d
- if {[incr i] > 1} {
+ if {[lsearch $databaseDefault $d] == -1} {
html {"> } $d \n
} else {
html {" checked> } $d \n
set fields [lindex $targets($host) 2]
for {set no 1} {$no < 4} {incr no} {
html {<select name="menu} $no {">} \n
+ if {$oSetNo > 0} {
+ html {<option> } $hist($oSetNo,form,menu$no) \n
+ }
foreach f $fields {
- html {<option> } [lindex $f 0] \n
+ set name [lindex $f 0]
+ if {$oSetNo > 0} {
+ if {$hist($oSetNo,form,menu$no) == $name} continue
+ }
+ html {<option> } $name \n
}
html "</select>\n"
- html {<input type="text" name="entry} $no {" size=30>} \n
+ html {<input type="text" name="entry} $no {"}
+ html { size=30>} \n
if {$no < 3} {
html {<select name="logic} $no {">} \n
- html "<option> And\n"
- html "<option> Or\n"
- html "<option> And not\n"
+ if {$oSetNo > 0} {
+ html "<option> " $hist($oSetNo,form,logic$no) \n
+ }
+ foreach op {And Or {And not}} {
+ if {$oSetNo > 0} {
+ if {$hist($oSetNo,form,logic$no) == $op} continue
+ }
+ html "<option> " $op \n
+ }
html "</select>\n"
}
html "<br>\n"
<hr>
<input type=submit value="Search"><input type=reset value="Reset">
<h3> Various technical parameters: </h3> <br>
-Max hits: <input type="text" name="hits" value="20" size=3>
+{
+ html {Max hits: <input type="text" name="hits" value="}
+ if {$oSetNo > 0} {
+ html $hist($oSetNo,maxPresent)
+ } else {
+ html 20
+ }
+ html {" size=3>}
+}
Records are shown in:
<select name="format">
<option> Long format
<html>
{
-# $Id: search.egw,v 1.15 1995/11/13 15:41:44 adam Exp $
+# $Id: search.egw,v 1.16 1995/11/13 18:17:48 adam Exp $
proc buttons {setNo setMax startPos after} {
global sessionId
set hist($nextSetNo,host) $hist($setNo,host)
set setNo $nextSetNo
html "using host " $hist($setNo,host) " <br\n"
- incr nextSetNo
- set hist($setNo,query) [build-query $hist($setNo,host)]
+ set query [build-query $hist($setNo,host)]
+ if {"x$query" == "x"} {
+ html "<head><title> WWW/Z39.50 Gateway Search</title>\n<body>\n"
+ displayError "Empty query" \
+ "You must specify at least one search word"
+ html "</body></html>\n"
+ wabort
+ }
+ set hist($setNo,query) $query
+
+ set hist($setNo,form,menu1) [wform menu1]
+ set hist($setNo,form,menu2) [wform menu2]
+ set hist($setNo,form,menu3) [wform menu3]
+
+ set hist($setNo,form,entry1) [wform entry1]
+ set hist($setNo,form,entry2) [wform entry2]
+ set hist($setNo,form,entry3) [wform entry3]
+
+ set hist($setNo,form,logic1) [wform logic1]
+ set hist($setNo,form,logic2) [wform logic2]
+
+ incr nextSetNo
set b [wform base]
if {$b == ""} {
set hist($setNo,database) $databases
#
-# $Id: z39util.tcl,v 1.8 1995/11/13 15:41:46 adam Exp $
+# $Id: z39util.tcl,v 1.9 1995/11/13 18:17:48 adam Exp $
#
proc saveState {} {
uplevel #0 {
set code [lindex $status 1]
set msg [lindex $status 2]
set addinfo [lindex $status 3]
- html "<h2>Error NSD$code: $msg: $addinfo </h2><br>\n"
+ displayError "Diagnostic message" \
+ "$msg: $addinfo<br>\n(error code $code)"
set sessionWait -2
} else {
set sessionWait 1
set sessionWait 0
if {[catch [list $zz connect $host]]} {
- html "Cannot connect to target ${host} <br>\n"
+ displayError "Cannot connect to target" $host
return 0
} elseif {$sessionWait == 0} {
zwait sessionWait
if {$sessionWait != 1} {
- html "Cannot connect to target ${host} <br>\n"
+ displayError "Cannot connect to target" $host
return 0
}
}
$zz idAuthentication $idAuth
set sessionWait 0
- if {[catch [list $zz init]]} {
- html "Cannot initialize with target ${host} <br>\n"
+ if {[catch {$zz init}]} {
+ displayError "Cannot initialize target" $host
return 0
}
if {[catch {zwait sessionWait 60}]} {
- html "Cannot initialize with target ${host} <br>\n"
+ displayError "Cannot initialize target" $host
$zz disconnect
return 0
}
if {$sessionWait != "1"} {
- html "Cannot initialize with target ${host} <br>\n"
+ displayError "Cannot initialize target" $host
$zz disconnect
return 0
}
if {![$zz initResult]} {
set u [$zz userInformationField]
$zz disconnect
- html "Connection rejected by target: $u <br>\n"
+ displayError "Cannot initialize target $host" $u
return 0
}
}
$zz.$setNo recordElements $elements
eval $zz.$setNo databaseNames $database
-
$zz.$setNo preferredRecordSyntax USMARC
$zz callback search-response $setNo
$zz.$setNo search $query
if {[catch {zwait sessionWait 600}]} {
+ displayError "Timeout in search" {}
html "</body></html>\n"
$zz disconnect
return 0
}
if {$sessionWait != 1} {
+ displayError "Search fail" "Connection closed"
html "</body></html>\n"
$zz disconnect
return 0
set code [lindex $status 1]
set msg [lindex $status 2]
set addinfo [lindex $status 3]
- html "<h2>Error NSD$code: $msg: $addinfo </h2><br>\n"
+ displayError "Diagnostic message" \
+ "$msg: $addinfo\n<br>(error code $code)"
return 0
}
set hist($setNo,hits) [$zz.$setNo resultCount]
$zz disconnect
break
}
+ if {$sessionWait == "0"} {
+ $zz disconnect
+ }
if {$sessionWait != "1"} {
break
}
for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
html {<dt> <a href="http:} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + 1
- html + [expr $hist($setNo,maxPresent) - 1]
+ html + $hist($setNo,maxPresent)
html {"> } [lindex $targets($hist($setNo,host)) 0]
if {[llength $hist($setNo,database)] > 1} {
html ": "
}
html "</dl>\n"
}
+
+proc displayError {msga msgb} {
+ html "<p><center>\n"
+ html {<img src="/gif/noway.gif">}
+ html "<h2>" $msga "</h2>\n"
+ if {$msgb != ""} {
+ html "<h3>" $msgb "</h3>\n"
+ }
+ html "</center><p>\n"
+}
projects / egate.git / commitdiff
