From 3d4b6045b8875099666b99edbf1457c91b5da928 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 8 Nov 1995 18:07:22 +0000 Subject: [PATCH] Minor changes. --- www/Makefile | 7 +++++-- www/mquery.egw | 18 +++++++++++++++--- www/msearch.egw | 10 +++++----- www/mtargets.egw | 18 ++++++++++++++---- www/query.egw | 4 ++-- www/z39util.tcl | 6 +++++- www/ztargets.conf | 6 +++--- 7 files changed, 49 insertions(+), 20 deletions(-) diff --git a/www/Makefile b/www/Makefile index b522a08..4274f14 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2,7 +2,10 @@ # Europagate, 1995 # # $Log: Makefile,v $ -# Revision 1.12 1995/11/08 16:14:32 adam +# 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. # @@ -50,7 +53,7 @@ SHELL=/bin/sh ZDEFS= ZINC=-I../../yaz/include ZLIB=../../yaz/lib/libyaz.a -#MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a +MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB) # OLIB=../lib/util.a ../lib/libres+log.a diff --git a/www/mquery.egw b/www/mquery.egw index 051dc91..755b77a 100644 --- a/www/mquery.egw +++ b/www/mquery.egw @@ -4,7 +4,7 @@ { -# $Id: mquery.egw,v 1.2 1995/11/08 16:14:32 adam Exp $ +# $Id: mquery.egw,v 1.3 1995/11/08 18:07:22 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -21,6 +21,17 @@ set nextSetNo 1 set setNo 1 } + if {1} { + set i 1 + foreach host [array names targets] { + set databases [wform target$host] + if {$databases == ""} continue + html "host=$host, $databases
\n" + set hist($setNo,$i,host) $host + set hist($setNo,$i,database) $databases + incr i + } + } else { set hosts [wform target] html "hosts=$hosts
\n" set i 1 @@ -29,8 +40,9 @@ set hist($setNo,$i,database) [lindex [lindex $targets($host) 1] 0] incr i } - set hist($setNo,0,host) [expr $i - 1] set host [lindex $hosts 0] + } + set hist($setNo,0,host) [expr $i - 1] }

Input your search criteria:


@@ -64,7 +76,7 @@ Records are shown in:

- +

This page is maintained by Peter Wad Hansen . diff --git a/www/msearch.egw b/www/msearch.egw index 7f41697..c1c825a 100644 --- a/www/msearch.egw +++ b/www/msearch.egw @@ -1,6 +1,6 @@ { -# $Id: msearch.egw,v 1.2 1995/11/08 16:14:33 adam Exp $ +# $Id: msearch.egw,v 1.3 1995/11/08 18:07:22 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -11,6 +11,8 @@ global hist global zstatus + html " WWW/Z39.50 Gateway Search \n" + html "\n" if {[wform menu1] == ""} { set setNo [lindex $sessionParms 0] } else { @@ -32,9 +34,6 @@ set hist($setNo,maxPresent) 30 } } - html " WWW/Z39.50 Gateway Search \n" - html "\n" - z39msearch $setNo 1 html "
\n" @@ -79,7 +78,8 @@ } html "form: " [wform] "
\n" html "target: " $host "
\n" - html "query: --" $hist($setNo,1,query) "--
" + html "query: --" $hist($setNo,1,query) "--
\n" + html "database: " $hist($setNo,1,database) "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" } diff --git a/www/mtargets.egw b/www/mtargets.egw index 095aa8a..3f846da 100644 --- a/www/mtargets.egw +++ b/www/mtargets.egw @@ -1,6 +1,6 @@ { -# $Id: mtargets.egw,v 1.3 1995/11/08 16:14:33 adam Exp $ +# $Id: mtargets.egw,v 1.4 1995/11/08 18:07:23 adam Exp $ set setNo 1 source /usr/local/etc/httpd/conf/ztargets.conf if {[info commands saveState] == ""} { @@ -17,11 +17,21 @@ { html {

} \n + html "
\n" foreach t [array names targets] { - html { } $t \n - html "
\n" + html {
} [ lindex $targets($t) 0] +# html { } + html {
} + set databases [lindex $targets($t) 1] + foreach d $databases { + html {} " $d " + html "
\n" + } + html "\n" } + html "
\n" }
diff --git a/www/query.egw b/www/query.egw index e2f9468..152af07 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.11 1995/11/08 16:14:33 adam Exp $ +# $Id: query.egw,v 1.12 1995/11/08 18:07:23 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -150,7 +150,7 @@ Records are shown in:

- +

This page is maintained by Peter Wad Hansen . diff --git a/www/z39util.tcl b/www/z39util.tcl index 5c81b13..6b56df4 100644 --- a/www/z39util.tcl +++ b/www/z39util.tcl @@ -1,5 +1,5 @@ # -# $Id: z39util.tcl,v 1.4 1995/11/08 16:14:36 adam Exp $ +# $Id: z39util.tcl,v 1.5 1995/11/08 18:07:23 adam Exp $ # proc saveState {} { uplevel #0 { @@ -16,6 +16,10 @@ proc saveState {} { eval "set v \$${var}(\$n)" puts $f "set ${var}($n) \{$v\}" } + catch { + eval "set v \$${var}" + puts $f "set ${var} \{$v\}" + } } } close $f diff --git a/www/ztargets.conf b/www/ztargets.conf index ef953d2..b8ed1d6 100644 --- a/www/ztargets.conf +++ b/www/ztargets.conf @@ -1,4 +1,4 @@ -# $Id: ztargets.conf,v 1.7 1995/11/08 16:14:36 adam Exp $ +# $Id: ztargets.conf,v 1.8 1995/11/08 18:07:23 adam Exp $ set commonFields { { Title {@attr 1=4} } { Author {@attr 1=1003} } @@ -34,7 +34,7 @@ set targets(z3950.bibsys.no:2100) [list \ BIBSYS \ $commonFields \ {} \ - {BIBSYS - norway} \ + {BIBSYS - Norway} \ ] set targets(dtbsun.dtv.dk:4500) [list \ @@ -55,7 +55,7 @@ set targets(dtbsun.dtv.dk:210) [list \ { All {@attr 1=1016} } \ } \ {<>} \ - {SR Target DanBib trough the Europagate gateway} \ + {SR Target DanBib through the Europagate gateway} \ ] set targets(localhost:9999) [list \ -- 1.7.10.4