From cc5af6a5323f9576c208519dbf4351b4f818e166 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 9 Jan 1996 16:16:47 +0000 Subject: [PATCH] Port to OSF/1. Gif references moved from /gif/ to /egwgif/. --- www/Makefile | 102 +++++++++--------------------------------------------- www/history.egw | 6 ++-- www/mquery.egw | 6 ++-- www/msearch.egw | 8 ++--- www/mtargets.egw | 4 +-- www/search.egw | 14 ++++---- www/showfull.egw | 16 ++++----- www/targets.egw | 4 +-- www/wirtcl.c | 17 +++++---- www/z39util.tcl | 14 ++++---- 10 files changed, 63 insertions(+), 128 deletions(-) diff --git a/www/Makefile b/www/Makefile index 8f8307b..72b8528 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,94 +1,20 @@ # Makefile for www gateway utility # Europagate, 1995 # -# $Log: Makefile,v $ -# Revision 1.21 1996/01/09 10:46:48 adam -# New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile. -# -# Revision 1.20 1996/01/03 15:19:35 adam -# Improved history. -# Better working scan. -# New maintanance function to print contact info, etc. -# -# Revision 1.19 1996/01/02 10:52:25 adam -# In images Alt=... are defined. -# -# Revision 1.18 1995/12/20 16:31:30 adam -# Bug fix: shell might terminate even though new request was initiated -# by the cgi interface program. -# Work on more simple user interface and Europagate buttons. -# -# Revision 1.17 1995/11/14 16:31:35 adam -# Temporary remove of ccl entry. -# -# Revision 1.16 1995/11/14 16:01:50 adam -# Bug fix: didn't use correct database(s) when 'all' checkbox was selected. -# -# 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. -# -# Revision 1.13 1995/11/08 18:07:22 adam -# Minor changes. -# -# Revision 1.12 1995/11/08 16:14:32 adam -# Many improvements and bug fixes. -# First version that ran on dtbsun. -# -# Revision 1.11 1995/11/07 14:56:58 adam -# Work on search in multiple targets. -# New wtcl command: wlog. -# Optional timeout parameter to zwait. -# -# Revision 1.10 1995/11/07 10:44:29 adam -# Work on search in multiple targets. -# -# 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. -# -# 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 -# IrTcl incorporated in the gateway. -# Better separation of script types. -# Z39.50 gateway scripts entered. -# -# Revision 1.4 1995/10/23 17:04:16 adam -# Added some initial z39 gateway scripts. -# -# Revision 1.3 1995/10/23 16:55:33 adam -# A lot of changes - really. -# -# Revision 1.2 1995/10/20 14:02:40 adam -# First version of WWW gateway with embedded Tcl. -# -# Revision 1.1 1995/10/20 11:49:24 adam -# First version of www gateway. +# $Id: Makefile,v 1.22 1996/01/09 16:16:47 adam Exp $ # SHELL=/bin/sh # ZDEFS= -#ZINC=-I../../yaz/include +ZINC=-I../../yaz/include ZLIB=../../yaz/lib/libyaz.a -MOSILIB=../../xtimosi/src/libmosi.a -lrfc -LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB) +#MOSILIB=../../xtimosi/src/libmosi.a -lrfc +LIBIRTCL=../../ir-tcl/libirtcl.a $(ZLIB) $(MOSILIB) #NETLIB=-lnsl -lsocket # OLIB=../lib/util.a ../lib/libres+log.a TCLLIB=/usr/local/lib/libtcl7.4.a +TCLINC=-I/usr/local/include # WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \ mtargets.egw mquery.egw msearch.egw history.egw @@ -105,12 +31,18 @@ CPP=$(CC) -E HTTPDDIR=/usr/local/etc/httpd CGIDIR=$(HTTPDDIR)/cgi-bin HTDOCS=$(HTTPDDIR)/htdocs -CONFDIR=$(HTTPDDIR)/conf EGWDIR=$(HTTPDDIR)/egw -LOGDIR=$(HTTPDDIR)/egw -GIFDIR=$(HTDOCS)/gif +LOGDIR=$(HTTPDDIR)/logs +GIFDIR=$(HTDICS)/egwgif + +#HTTPDDIR=/usr/local/www +#CGIDIR=/usr/local/www/cgi-bin +#HTDOCS=/data2/html/egw/html +#EGWDIR=/data2/html/egw/scripts +#LOGDIR=/data2/html/egw/logs +#GIFDIR=/data2/html/egw/gif -INCLUDE=-I../include $(ZINC) +INCLUDE=-I../include $(ZINC) $(TCLINC) DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \ -DLOGDIR=\"$(LOGDIR)\" @@ -132,7 +64,7 @@ install.prog: $(TPROG1) $(TPROG2) @for x in $(TPROG1) $(TPROG2); do \ echo Installing $$x; \ cp $$x $(CGIDIR); \ - chmod +x $(CGIDIR)/$$x; \ + chmod a+x $(CGIDIR)/$$x; \ done; \ for p in egwtcl egwirtcl egwhtml; do \ rm -f $(CGIDIR)/$$p; \ @@ -154,7 +86,7 @@ install.script: done @for x in $(CONFFILES); do \ echo Installing $$x; \ - cp $$x $(CONFDIR); \ + cp $$x $(EGWDIR); \ done @for x in gif/*.gif; do \ echo Installing $$x; \ diff --git a/www/history.egw b/www/history.egw index 64f13c7..a0cd7f2 100644 --- a/www/history.egw +++ b/www/history.egw @@ -4,7 +4,7 @@ { -# $Id: history.egw,v 1.1 1996/01/03 15:19:36 adam Exp $ +# $Id: history.egw,v 1.2 1996/01/09 16:16:47 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -13,14 +13,14 @@ z39history if {$useIcons} { - html {Europagate} + html {Europagate} } else { html {Europagate | } } html {} } else { html {">New Target} "\n" diff --git a/www/mquery.egw b/www/mquery.egw index 9e76a03..c205519 100644 --- a/www/mquery.egw +++ b/www/mquery.egw @@ -4,7 +4,7 @@ { -# $Id: mquery.egw,v 1.8 1996/01/08 08:42:13 adam Exp $ +# $Id: mquery.egw,v 1.9 1996/01/09 16:16:47 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -74,12 +74,12 @@ { global useIcons if {$useIcons} { - html {} + html {} } html {} + html {">} } else { html {"> New target } } diff --git a/www/msearch.egw b/www/msearch.egw index 01fa9ab..5c4f410 100644 --- a/www/msearch.egw +++ b/www/msearch.egw @@ -1,6 +1,6 @@ { -# $Id: msearch.egw,v 1.10 1996/01/08 08:42:13 adam Exp $ +# $Id: msearch.egw,v 1.11 1996/01/09 16:16:48 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -64,19 +64,19 @@ global useIcons if {$useIcons} { - html {} + html {} } html {} + html {">} } else { html {"> New target } " | \n" } html {} + html {">} } else { html {"> New query } } diff --git a/www/mtargets.egw b/www/mtargets.egw index 9254cad..1967138 100644 --- a/www/mtargets.egw +++ b/www/mtargets.egw @@ -1,6 +1,6 @@ { -# $Id: mtargets.egw,v 1.9 1996/01/08 08:42:14 adam Exp $ +# $Id: mtargets.egw,v 1.10 1996/01/09 16:16:48 adam Exp $ set setNo 1 source /usr/local/etc/httpd/conf/ztargets.conf if {[info commands saveState] == ""} { @@ -29,7 +29,7 @@ } }
-EUROPAGATE +EUROPAGATE

Choose one or more Z39.50 targets

{ diff --git a/www/search.egw b/www/search.egw index 587e94d..45589ac 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.25 1996/01/08 08:42:17 adam Exp $ +# $Id: search.egw,v 1.26 1996/01/09 16:16:48 adam Exp $ proc start-scan {scanNo cache dir} { global sessionId @@ -43,7 +43,7 @@ proc start-scan {scanNo cache dir} { html {} if {$useIcons} { - html {} } else { html {Previous Terms | } @@ -52,7 +52,7 @@ proc start-scan {scanNo cache dir} { html {} if {$useIcons} { - html {} } else { html {Next Terms | } @@ -69,7 +69,7 @@ proc start-scan {scanNo cache dir} { html {} if {$useIcons} { - html {} } else { html {Previous Terms | } @@ -78,7 +78,7 @@ proc start-scan {scanNo cache dir} { html {} if {$useIcons} { - html {} } else { html {Next Terms | } @@ -115,7 +115,7 @@ proc buttons {setNo setMax startPos after} { html / $sessionId {/search.egw/} $setNo + [expr $setMax + 1] html + [expr $setMax + $hist($setNo,maxPresent)] if {$useIcons} { - html {">Next RecordsNext Records} } else { html {">Next Records} " | \n" @@ -127,7 +127,7 @@ proc buttons {setNo setMax startPos after} { html + [expr $startPos - $hist($setNo,maxPresent)] html + [expr $startPos - 1] if {$useIcons} { - html {">} } else { html {">Previous Records} " | \n" diff --git a/www/showfull.egw b/www/showfull.egw index 8679310..3cacea1 100644 --- a/www/showfull.egw +++ b/www/showfull.egw @@ -1,6 +1,6 @@ { -# $Id: showfull.egw,v 1.15 1996/01/03 15:19:47 adam Exp $ +# $Id: showfull.egw,v 1.16 1996/01/09 16:16:49 adam Exp $ proc buttons {setNo tno no format count host after} { global sessionId @@ -15,7 +15,7 @@ proc buttons {setNo tno no format count host after} { html / $sessionId {/showfull.egw/} $setNo + $tno + html [expr $no + 1] + $format if {$useIcons} { - html {">} } else { html {">Next Record} " | \n" @@ -26,7 +26,7 @@ proc buttons {setNo tno no format count host after} { html / $sessionId {/showfull.egw/} $setNo + $tno + html [expr $no - 1] + $format if {$useIcons} { - html {">} } else { html {">Previous Record} " | \n" @@ -38,7 +38,7 @@ proc buttons {setNo tno no format count host after} { if {$format == "full"} { html raw if {$useIcons} { - html {">} } else { html {">Raw Format} " | \n" @@ -46,7 +46,7 @@ proc buttons {setNo tno no format count host after} { } else { html full if {$useIcons} { - html {">} } else { html {">Full Format} " | \n" @@ -62,7 +62,7 @@ proc buttons {setNo tno no format count host after} { html $setNo + 1 html + $hist($setNo,maxPresent) if {$useIcons} { - html {">} } else { html {">Result Set} " | \n" @@ -75,7 +75,7 @@ proc buttons {setNo tno no format count host after} { } html $host + $setNo if {$useIcons} { - html {">} } else { html {">New Query} " | \n" @@ -87,7 +87,7 @@ proc buttons {setNo tno no format count host after} { html {/targets.egw} } if {$useIcons} { - html {">} } else { html {">New Target} diff --git a/www/targets.egw b/www/targets.egw index 39e1205..f1cf267 100644 --- a/www/targets.egw +++ b/www/targets.egw @@ -1,7 +1,7 @@ { -# $Id: targets.egw,v 1.13 1996/01/08 19:16:32 adam Exp $ - source /usr/local/etc/httpd/conf/ztargets.conf +# $Id: targets.egw,v 1.14 1996/01/09 16:16:49 adam Exp $ + source ztargets.conf if {[info commands saveState] == ""} { source z39util.tcl } diff --git a/www/wirtcl.c b/www/wirtcl.c index 28f9dee..b45ec48 100644 --- a/www/wirtcl.c +++ b/www/wirtcl.c @@ -41,7 +41,10 @@ * USE OR PERFORMANCE OF THIS SOFTWARE. * * $Log: wirtcl.c,v $ - * Revision 1.10 1996/01/09 10:46:50 adam + * Revision 1.11 1996/01/09 16:16:49 adam + * Port to OSF/1. Gif references moved from /gif/ to /egwgif/. + * + * Revision 1.10 1996/01/09 10:46:50 adam * New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile. * * Revision 1.9 1995/11/07 14:56:59 adam @@ -290,18 +293,18 @@ static int events (struct tcl_info *p, char *waitVar, int tout) { if (FD_ISSET (i, &fdset_tcl_r)) { - assert (callback_table[i].r_handle); - (*callback_table[i].r_handle) (callback_table[i].obj); + if (callback_table[i].r_handle); + (*callback_table[i].r_handle) (callback_table[i].obj); } if (FD_ISSET (i, &fdset_tcl_w)) { - assert (callback_table[i].w_handle); - (*callback_table[i].w_handle) (callback_table[i].obj); + if (callback_table[i].w_handle) + (*callback_table[i].w_handle) (callback_table[i].obj); } if (FD_ISSET (i, &fdset_tcl_x)) { - assert (callback_table[i].x_handle); - (*callback_table[i].x_handle) (callback_table[i].obj); + if (callback_table[i].x_handle) + (*callback_table[i].x_handle) (callback_table[i].obj); } } } diff --git a/www/z39util.tcl b/www/z39util.tcl index 4853f0a..e2dca2f 100644 --- a/www/z39util.tcl +++ b/www/z39util.tcl @@ -1,5 +1,5 @@ # -# $Id: z39util.tcl,v 1.18 1996/01/04 13:30:33 adam Exp $ +# $Id: z39util.tcl,v 1.19 1996/01/09 16:16:49 adam Exp $ # proc saveState {} { uplevel #0 { @@ -930,7 +930,7 @@ proc z39history {} { proc displayError {msga msgb} { html "

\n" - html {Error} + html {Error} html "

" $msga "

\n" if {$msgb != ""} { html "

" $msgb "

\n" @@ -941,7 +941,7 @@ proc displayError {msga msgb} { proc button-europagate {} { global useIcons if {$useIcons} { - html {Europagate} + html {Europagate} } else { html {Europagate | } } @@ -955,7 +955,7 @@ proc button-new-target {more} { html {} } else { html {">New Target} @@ -975,7 +975,7 @@ proc button-view-history {more} { html {View HistoryView History} } else { html {">View History} @@ -996,7 +996,7 @@ proc button-new-query {more setNo} { html {} if {$useIcons} { - html {} } else { html {New Query} @@ -1011,7 +1011,7 @@ proc button-new-query {more setNo} { proc maintenance {} { html {
This page is maintained by } html { Peter Wad Hansen .} - html {Last modified 3. january 1996.
} + html {Last modified 9. january 1996.
} html { This and the following pages are under construction and } html {will continue to be so until the end of January 1996.} } -- 1.7.10.4