projects / egate.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31c1134)
Minor changes.
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 25 Apr 1996 10:22:20 +0000 (10:22 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 25 Apr 1996 10:22:20 +0000 (10:22 +0000)
www/Makefile patch | blob | history
www/mtargets.egw patch | blob | history
www/targets.egw patch | blob | history
www/ztargets.conf patch | blob | history

diff --git a/www/Makefile b/www/Makefile
index 8744ac0..0e2a4fb 100644 (file)
--- 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 (file)
--- a/www/mtargets.egw
+++ b/www/mtargets.egw
@@ -1,6 +1,6 @@
 <html>
 {
-# $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 {<dt><b>} [ lindex $targets($t) 0]
+        global waisFlag
+        if {!$waisFlag && ![string compare [lindex $targets($t) 1] WAIS]} {
+            return
+        }
+        html {<dt><b>} [lindex $targets($t) 0]
         html {</b>: }
         set databases [splitDatabaseSpec $t]
         
@@ -63,6 +67,14 @@
         }
         html "<br><br>\n"
     }
+    if {![info exists waisFlag]} {
+        set waisFlag 1
+        if {[catch {wais waisdummy}]} {
+            set waisFlag 0
+        } else {
+            rename waisdummy {}
+        }
+    }
     serverList headlineC targetC
 
     html "</dl>\n"
diff --git a/www/targets.egw b/www/targets.egw
index bd4838b..4ca8c0a 100644 (file)
--- a/www/targets.egw
+++ b/www/targets.egw
@@ -1,6 +1,6 @@
 <html>
 {
-# $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 "<h2>Select a target</h2><br>\n"
     html "<dl>\n"
 
-    if {1} {
     proc headlineC {h} {
         html {<dt><h2>} $h \n {</h2>}
     }
@@ -51,7 +50,11 @@
         global targets
         global env
         global sessionId
+        global waisFlag
 
+        if {!$waisFlag && ![string compare [lindex $targets($t) 1] WAIS]} {
+            return
+        }
         html {<dt><b><a href="http:} $env(SCRIPT_NAME) /
         html "$sessionId/query.egw;/-1+$t" {"> } [lindex $targets($t) 0]
         html {</a></b>}
@@ -63,26 +66,16 @@
         }
         html "<br>\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 {<dt><a href="http:} $env(SCRIPT_NAME) /
-        html "$sessionId/query.egw;/-1+$t" {"> } [lindex $targets($t) 0]
-        html " </a>\n"
-        set desc [lindex $targets($t) 4]
-        if {$desc != ""} {
-            html "<dd>$desc\n"
+    if {![info exists waisFlag]} {
+        set waisFlag 1
+        if {[catch {wais waisdummy}]} {
+            set waisFlag 0
+        } else {
+            rename waisdummy {}
         }
     }
-    }
+    serverList headlineC targetC
+
     html "</dl><br>\n"
     set useIcons 0
     button-main 
diff --git a/www/ztargets.conf b/www/ztargets.conf
index 504e64f..e2c58e5 100644 (file)
--- 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: <br>
      usgs: sample of USGS data directory <br>
      esdd: additional Earch Science Data Directory records <br>
-     iah: data directory for the International Association of Hydrologists <br>
-     cd_rom: SIG-CAT compendium of CD-ROMs.
+     iah: data directory for the International Association of Hydrologists
     }
     1
     gils
Europgate