From: Adam Dickmeiss Date: Tue, 31 Oct 1995 16:56:23 +0000 (+0000) Subject: Record presentation. X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=cbf0ef7549f996f4d96f41c6dafa76dc17dd7782;p=egate.git Record presentation. --- diff --git a/www/Makefile b/www/Makefile index ae58bd1..be88fa7 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2,7 +2,10 @@ # Europagate, 1995 # # $Log: Makefile,v $ -# Revision 1.6 1995/10/27 17:30:15 adam +# Revision 1.7 1995/10/31 16:56:23 adam +# Record presentation. +# +# Revision 1.6 1995/10/27 17:30:15 adam # First search request/response that works. # # Revision 1.5 1995/10/27 15:12:02 adam @@ -23,15 +26,17 @@ # First version of www gateway. # SHELL=/bin/sh -INCLUDE=-I../include # +ZDEFS= +ZINC=-I../../yaz/include +ZLIB=../../yaz/lib/libyaz.a MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a -LIBIRTCL=/usr/local/lib/libirtcl.a ../../yaz/lib/libyaz.a $(MOSILIB) +LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB) # -#CFLAGS=-g -Wall -pedantic -ansi OLIB=../lib/libres+log.a TCLLIB=/usr/local/lib/libtcl7.4.a -WSCRIPTS=egwscript targets.egw query.egw search.egw +# +WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw HSCRIPTS=egwindex.html CONFFILES=ztargets.conf GIFFILES=webgate.gif @@ -42,7 +47,9 @@ P1=wcgi.o P2=wproto.o winterp.o wsh.o wtcl.o whtml.o wirtcl.o P3=wproto.o wtest.o CPP=$(CC) -E -DEFS=$(INCLUDE) +# +INCLUDE=-I../include $(ZINC) +DEFS=$(INCLUDE) $(ZDEFS) HTTPDDIR=/usr/local/etc/httpd CGIBIN=$(HTTPDDIR)/cgi-bin diff --git a/www/query.egw b/www/query.egw index 1677291..8450154 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,42 +4,48 @@ { -# $Id: query.egw,v 1.5 1995/10/31 10:03:51 adam Exp $ +# $Id: query.egw,v 1.6 1995/10/31 16:56:23 adam Exp $ proc fail-response {} { global sessionWait set sessionWait -1 } -proc init-response {} { +proc ok-response {} { global sessionWait set sessionWait 1 } - set t $sessionParms - set databases [lindex $targets($t) 1] + global host + set host $sessionParms + set databases [lindex $targets($host) 1] catch {z39 disconnect} set sessionWait 0 ir z39 z39 failback fail-response - if {[catch {z39 connect $t}]} { - htmlr "Cannot connect to target $t
" + z39 callback ok-response + if {[catch {z39 connect $host}]} { + htmlr "Cannot connect to target ${host}
" htmlr "" wabort - } - z39 callback init-response + } elseif {$sessionWait == 0} { + zwait sessionWait + if {$sessionWait != 1} { + htmlr "Cannot connect to target ${host}
" + htmlr "" + wabort + } + } + set sessionWait 0 z39 init zwait sessionWait if {$sessionWait == -1} { - htmlr "Cannot initialize with target $t
" + htmlr "Cannot initialize with target ${host}
" htmlr "" wabort } - htmlr { -

Search in databases

Not Functional Yet

- } + htmlr {

Search in databases

} html {

} + htmlr / $sessionId {/search.egw/} $host {" method=post>} set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -66,7 +72,7 @@ proc init-response {} {

Input your search criteria:
{ - set fields [lindex $targets($t) 2] + set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { htmlr {