From 94e0e8ff10cdb5142f983cd76156310461f9eb89 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 6 Nov 1995 17:44:20 +0000 Subject: [PATCH] State reestablised when shell restarts. History of previous result sets. --- www/Makefile | 8 +- www/query.egw | 19 +++- www/search.egw | 312 +++++++--------------------------------------------- www/showfull.egw | 73 ++++++++++++- www/targets.egw | 12 +- www/wcgi.c | 47 +++++--- www/winterp.h | 10 +- www/wirtcl.c | 27 ++++- www/wsh.c | 10 +- www/wtcl.c | 50 ++++++++- www/z39util.tcl | 316 +++++++++++++++++++++++++++++++++++++++++++++++++++++ www/ztargets.conf | 4 +- 12 files changed, 574 insertions(+), 314 deletions(-) create mode 100644 www/z39util.tcl diff --git a/www/Makefile b/www/Makefile index 98c0843..a9fe474 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2,7 +2,11 @@ # Europagate, 1995 # # $Log: Makefile,v $ -# Revision 1.8 1995/11/06 10:51:14 adam +# Revision 1.9 1995/11/06 17:44:20 adam +# State reestablised when shell restarts. History of previous +# result sets. +# +# Revision 1.8 1995/11/06 10:51:14 adam # End of response marker in response from wsh/wproto to wcgi. # Shells are respawned when necessary. # @@ -40,7 +44,7 @@ LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB) OLIB=../lib/util.a ../lib/libres+log.a TCLLIB=/usr/local/lib/libtcl7.4.a # -WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw +WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl HSCRIPTS=egwindex.html CONFFILES=ztargets.conf GIFFILES=webgate.gif diff --git a/www/query.egw b/www/query.egw index ba6672f..9a72fe3 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,12 @@ { -# $Id: query.egw,v 1.8 1995/11/02 16:35:36 adam Exp $ +# $Id: query.egw,v 1.9 1995/11/06 17:44:20 adam Exp $ + + if {[info commands saveState] == ""} { + source z39util.tcl + } + proc fail-response {} { global sessionWait set sessionWait -1 @@ -55,7 +60,11 @@ proc ok-response {} { } } set sessionWait 0 - z39 init + if {[catch {z39 init}]} { + htmlr "Cannot initialize with target ${host}
" + htmlr "" + wabort + } zwait sessionWait if {$sessionWait != "1"} { htmlr "Cannot initialize with target ${host}
" @@ -92,7 +101,7 @@ proc ok-response {} { } }

-Input your search criteria:
+

Input your search criteria:

{ set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { @@ -117,7 +126,7 @@ Alternatively you can enter your query in CCL here:

- Various technical parameters:
+

Various technical parameters:

Max hits: Records are shown in: