From: Adam Dickmeiss Date: Wed, 24 Jan 1996 16:59:27 +0000 (+0000) Subject: More work on target definitons. X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=84081f9782ee28f9236b0974891f1d6b865992be;p=egate.git More work on target definitons. --- diff --git a/www/Makefile b/www/Makefile index 679f2eb..ab73261 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,7 +1,7 @@ # Makefile for www gateway utility # Europagate, 1995 # -# $Id: Makefile,v 1.25 1996/01/24 14:14:18 adam Exp $ +# $Id: Makefile,v 1.26 1996/01/24 16:59:27 adam Exp $ # SHELL=/bin/sh # @@ -48,14 +48,14 @@ DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \ all: $(TPROG1) $(TPROG2) -$(TPROG1): $(P1) +$(TPROG1): $(P1) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB) $(ZLIB) -$(TPROG2): $(P2) +$(TPROG2): $(P2) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \ $(NETLIB) $(TCLLIB) -lm -$(TPROG3): $(P3) +$(TPROG3): $(P3) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ZLIB) install: install.prog install.script diff --git a/www/query.egw b/www/query.egw index b28bcef..632f35e 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.30 1996/01/24 14:14:19 adam Exp $ +# $Id: query.egw,v 1.31 1996/01/24 16:59:28 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -47,24 +47,25 @@ proc ok-response {} { html "

Search in " [lindex $targets($host) 0] "


\n" z39 callback ok-response z39 failback fail-response - if {$host != $oldHost} { + set thisHost [splitHostSpec $host] + if {$thisHost != $oldHost} { 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 "\n" z39 disconnect egw_abort } elseif {$sessionWait == 0} { if {[catch {egw_wait sessionWait 35}]} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect egw_abort } if {$sessionWait != 1} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect egw_abort @@ -73,22 +74,22 @@ proc ok-response {} { set sessionWait 0 z39 idAuthentication $hist($setNo,idAuthentication) if {[catch {z39 init}]} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {[catch {egw_wait sessionWait 60}]} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {$sessionWait != "1"} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {![z39 initResult]} { - displayError "Connection rejected by target ${host}" \ + displayError "Connection rejected by target ${thisHost}" \ [z39 userInformationField] z39 disconnect html "\n" @@ -156,9 +157,9 @@ proc ok-response {} { if {[string length $template] > 0} { html { value="} $template {"} } - html { size=45> } + html { size=43> } if {0 && [lsearch [z39 options] scan] >= 0} { - html {} + html {} } if {$no < 3} { html {} + html "\n
This name serves as a short nickname of " + html "the target" html "\n
Description\n" - html {
} + html {
} + html "\n
A description of the server and what data " + html "it provides." html "\n
Host and port\n" - html {
} + html {
} html "\n
For example myhost.com:210" html "\n
Authentication\n" - html {
} - html "\n
Some targets require authentacation strings, " + html {
} + html "\n
Some targets require authentication strings, " html "i.e. passwords. Leave this field empty if no authentication " html "string is required." html "\n
Databases\n" - html {
} + html {
} html "\n
Separate each database by blanks" html "\n
Search fields\n" - html {