From 5595e73d139837cdb4b25c6c02f4e183b0188f3f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 25 Apr 1996 10:22:20 +0000 Subject: [PATCH] Minor changes. --- www/Makefile | 6 ++---- www/mtargets.egw | 16 ++++++++++++++-- www/targets.egw | 33 +++++++++++++-------------------- www/ztargets.conf | 7 +++---- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/www/Makefile b/www/Makefile index 8744ac0..0e2a4fb 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,7 +1,7 @@ # Makefile for www gateway utility # Europagate, 1995 # -# $Id: Makefile,v 1.37 1996/03/12 16:30:26 adam Exp $ +# $Id: Makefile,v 1.38 1996/04/25 10:22:20 adam Exp $ # SHELL=/bin/sh @@ -38,14 +38,12 @@ HTTPDDIR=/usr/local/etc/httpd CGIDIR=$(HTTPDDIR)/cgi-bin HTDOCS=$(HTTPDDIR)/htdocs EGWDIR=$(HTTPDDIR)/egw -LOGDIR=$(HTTPDDIR)/logs GIFDIR=$(HTDOCS)/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) $(TCLINC) $(IRTCLINC) @@ -74,7 +72,7 @@ $(TPROG4): $(P4) $(OLIB) install: install.prog install.script install.gif -install.prog: $(TPROG1) $(TPROG2) +install.prog: @if [ ! -d $(CGIDIR) ]; then \ echo "Making directory $(CGIDIR)"; \ mkdir $(CGIDIR); \ diff --git a/www/mtargets.egw b/www/mtargets.egw index 0d23dc9..f10238f 100644 --- a/www/mtargets.egw +++ b/www/mtargets.egw @@ -1,6 +1,6 @@ { -# $Id: mtargets.egw,v 1.20 1996/03/14 11:50:46 adam Exp $ +# $Id: mtargets.egw,v 1.21 1996/04/25 10:22:20 adam Exp $ set setNo 1 source ztargets.conf if {![info exists debug]} { @@ -48,7 +48,11 @@ } proc targetC {t} { global targets - html {
} [ lindex $targets($t) 0] + global waisFlag + if {!$waisFlag && ![string compare [lindex $targets($t) 1] WAIS]} { + return + } + html {
} [lindex $targets($t) 0] html {: } set databases [splitDatabaseSpec $t] @@ -63,6 +67,14 @@ } html "

\n" } + if {![info exists waisFlag]} { + set waisFlag 1 + if {[catch {wais waisdummy}]} { + set waisFlag 0 + } else { + rename waisdummy {} + } + } serverList headlineC targetC html "\n" diff --git a/www/targets.egw b/www/targets.egw index bd4838b..4ca8c0a 100644 --- a/www/targets.egw +++ b/www/targets.egw @@ -1,6 +1,6 @@ { -# $Id: targets.egw,v 1.24 1996/03/14 11:50:49 adam Exp $ +# $Id: targets.egw,v 1.25 1996/04/25 10:22:21 adam Exp $ source ztargets.conf if {![info exists debug]} { if {[lindex $sessionParms 1] == "1"} { @@ -43,7 +43,6 @@ html "

Select a target


\n" html "
\n" - if {1} { proc headlineC {h} { html {

} $h \n {

} } @@ -51,7 +50,11 @@ global targets global env global sessionId + global waisFlag + if {!$waisFlag && ![string compare [lindex $targets($t) 1] WAIS]} { + return + } html {
} [lindex $targets($t) 0] html {} @@ -63,26 +66,16 @@ } html "
\n" } - serverList headlineC targetC - - } else { - proc targetsCmp {l r} { - global targets - return [string compare [string tolower [lindex $targets($l) 0]] \ - [string tolower [lindex $targets($r) 0]]] - } - set tt [array names targets] - set tn [lsort -command targetsCmp $tt] - foreach t $tn { - html {
} [lindex $targets($t) 0] - html " \n" - set desc [lindex $targets($t) 4] - if {$desc != ""} { - html "
$desc\n" + if {![info exists waisFlag]} { + set waisFlag 1 + if {[catch {wais waisdummy}]} { + set waisFlag 0 + } else { + rename waisdummy {} } } - } + serverList headlineC targetC + html "

\n" set useIcons 0 button-main diff --git a/www/ztargets.conf b/www/ztargets.conf index 504e64f..e2c58e5 100644 --- a/www/ztargets.conf +++ b/www/ztargets.conf @@ -1,4 +1,4 @@ -# $Id: ztargets.conf,v 1.32 1996/03/14 11:50:53 adam Exp $ +# $Id: ztargets.conf,v 1.33 1996/04/25 10:22:21 adam Exp $ # # This file contains the predefined targets in the WWW-Z39.50 gateway # Each target is an entry in the associative array "targets". The @@ -96,7 +96,7 @@ set targets(ir.dbc.bib.dk:2008/danbib) { union } -set targets(dtbsun.dtv.dk:9999/usgs-esdd-iah-cd_rom) { +set targets(dtbsun.dtv.dk:9999/usgs-esdd-iah) { Zebra USMARC { @@ -112,8 +112,7 @@ set targets(dtbsun.dtv.dk:9999/usgs-esdd-iah-cd_rom) { {Zebra Z39.50 test server with GILS records. Databases:
usgs: sample of USGS data directory
esdd: additional Earch Science Data Directory records
- iah: data directory for the International Association of Hydrologists
- cd_rom: SIG-CAT compendium of CD-ROMs. + iah: data directory for the International Association of Hydrologists } 1 gils -- 1.7.10.4