From 84081f9782ee28f9236b0974891f1d6b865992be Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 24 Jan 1996 16:59:27 +0000 Subject: [PATCH] More work on target definitons. --- www/Makefile | 8 ++--- www/query.egw | 25 ++++++------- www/tdefine.egw | 17 ++++----- www/tform.egw | 18 ++++++---- www/z39util.tcl | 102 +++++++++++++++++++++++++++++++---------------------- www/ztargets.conf | 20 +++++------ 6 files changed, 107 insertions(+), 83 deletions(-) diff --git a/www/Makefile b/www/Makefile index 679f2eb..ab73261 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,7 +1,7 @@ # Makefile for www gateway utility # Europagate, 1995 # -# $Id: Makefile,v 1.25 1996/01/24 14:14:18 adam Exp $ +# $Id: Makefile,v 1.26 1996/01/24 16:59:27 adam Exp $ # SHELL=/bin/sh # @@ -48,14 +48,14 @@ DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \ all: $(TPROG1) $(TPROG2) -$(TPROG1): $(P1) +$(TPROG1): $(P1) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB) $(ZLIB) -$(TPROG2): $(P2) +$(TPROG2): $(P2) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \ $(NETLIB) $(TCLLIB) -lm -$(TPROG3): $(P3) +$(TPROG3): $(P3) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ZLIB) install: install.prog install.script diff --git a/www/query.egw b/www/query.egw index b28bcef..632f35e 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.30 1996/01/24 14:14:19 adam Exp $ +# $Id: query.egw,v 1.31 1996/01/24 16:59:28 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -47,24 +47,25 @@ proc ok-response {} { html "

Search in " [lindex $targets($host) 0] "

\n" z39 callback ok-response z39 failback fail-response - if {$host != $oldHost} { + set thisHost [splitHostSpec $host] + if {$thisHost != $oldHost} { catch {z39 disconnect} set sessionWait 0 - if {[catch {z39 connect $host}]} { - displayError "Cannot connect to target ${host}" {} + if {[catch {z39 connect $thisHost}]} { + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect egw_abort } elseif {$sessionWait == 0} { if {[catch {egw_wait sessionWait 35}]} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect egw_abort } if {$sessionWait != 1} { - displayError "Cannot connect to target ${host}" {} + displayError "Cannot connect to target ${thisHost}" {} html "\n" z39 disconnect egw_abort @@ -73,22 +74,22 @@ proc ok-response {} { set sessionWait 0 z39 idAuthentication $hist($setNo,idAuthentication) if {[catch {z39 init}]} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {[catch {egw_wait sessionWait 60}]} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {$sessionWait != "1"} { - displayError "Cannot initialize target ${host}" {} + displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort } if {![z39 initResult]} { - displayError "Connection rejected by target ${host}" \ + displayError "Connection rejected by target ${thisHost}" \ [z39 userInformationField] z39 disconnect html "\n" @@ -156,9 +157,9 @@ proc ok-response {} { if {[string length $template] > 0} { html { value="} $template {"} } - html { size=45> } + html { size=43> } if {0 && [lsearch [z39 options] scan] >= 0} { - html {} + html {} } if {$no < 3} { html {} + html "\n
This name serves as a short nickname of " + html "the target" html "\n

Description\n" - html {

} + html {

} + html "\n
A description of the server and what data " + html "it provides." html "\n

Host and port\n" - html {

} + html {

} html "\n
For example myhost.com:210" html "\n

Authentication\n" - html {

} - html "\n
Some targets require authentacation strings, " + html {

} + html "\n
Some targets require authentication strings, " html "i.e. passwords. Leave this field empty if no authentication " html "string is required." html "\n

Databases\n" - html {

} + html {

} html "\n
Separate each database by blanks" html "\n

Search fields\n" - html {

} 
+ html {<dd><textarea rows=8 cols=55 name="fields">} 
 html "Title 1=4\n"
 html "Author 1=1003\n"
 html "Abstract 1=62\n"
diff --git a/www/z39util.tcl b/www/z39util.tcl
index ca41b99..7903fd4 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.24 1996/01/24 14:14:20 adam Exp $
+# $Id: z39util.tcl,v 1.25 1996/01/24 16:59:29 adam Exp $
 #
 proc saveState {} {
 uplevel #0 {
@@ -130,7 +130,8 @@ proc display-brief {zset no tno} {
 if {$p} {
 html ": "
 }
-	html {}
+ html { <a href="http:} $env(SCRIPT_NAME) /
+ html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
 	set nope 1
 foreach v $title {
 html $v
@@ -139,23 +140,22 @@ proc display-brief {zset no tno} {
 if {$nope} {
 html {No title} 
 }
- html { }
+ html {</a> }
 	foreach v $cover {
 	 html $v
 	}
- html { }
-	foreach v $location {
-	 html " $v"
- }
-	foreach v $publisher {
-	 html " $v"
- }
-	foreach v $year {
-	 html " $v"
+ if {0} {
+ html { }
+ foreach v $location {
+ html " $v"
+ }
+ foreach v $publisher {
+ html " $v"
+ }
+ foreach v $year {
+ html " $v"
+ }
 }
- html { -- <a href="http:} $env(SCRIPT_NAME) /
- html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
-	html "view full</a>"
 }
 html " \n"
 }
@@ -462,13 +462,13 @@ proc build-query {t ilines} {
 }
 switch $op {
 And
- { set q "@and $q ${attr} ${term}" }
+ { set q "@and $q ${attr} \"${term}\"" }
 Or
- { set q "@or $q ${attr} ${term}" }
+ { set q "@or $q ${attr} \"${term}\"" }
 {And not}
- { set q "@not $q ${attr} ${term}" }
+ { set q "@not $q ${attr} \"${term}\"" }
 {}
- { set q "${attr} ${term}" }
+ { set q "${attr} \"${term}\"" }
 }
 set op [egw_form logic$i]
 }
@@ -505,45 +505,46 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
 set zs $zz.s$scanNo.$setNo
 $zz callback ok-response
 $zz failback fail-response
- if {$oldHost != $host} {
+ set thisHost [splitHostSpec $host]
+ if {$oldHost != $thisHost} {
 catch [list $zz disconnect]
 
 set sessionWait 0
- if {[catch [list $zz connect $host]]} {
- displayError "Cannot connect to target" $host
+ if {[catch [list $zz connect $thisHost]]} {
+ displayError "Cannot connect to target" $thisHost
 return 0
 } elseif {$sessionWait == 0} {
 if {[catch {egw_wait sessionWait 300}]} {
 		$zz disconnect
- displayError "Cannot connect to target" $host
+ displayError "Cannot connect to target" $thisHost
 return 0
 }
 if {$sessionWait != 1} {
- displayError "Cannot connect to target" $host
+ displayError "Cannot connect to target" $thisHost
 return 0
 }
 }
 $zz idAuthentication $idAuth
 set sessionWait 0
 if {[catch {$zz init}]} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
 	 $zz disconnect
 return 0
 }
 if {[catch {egw_wait sessionWait 60}]} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
 	 $zz disconnect
 return 0
 }
 if {$sessionWait != "1"} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
 	 $zz disconnect
 return 0
 }
 if {![$zz initResult]} {
 set u [$zz userInformationField]
 $zz disconnect
- displayError "Cannot initialize target $host" $u
+ displayError "Cannot initialize target $thisHost" $u
 return 0
 }
 } else {
@@ -647,45 +648,46 @@ proc z39search {setNo piggy tno elements} {
 }
 $zz callback ok-response
 $zz failback fail-response
- if {$oldHost != $host} {
+ set thisHost [splitHostSpec $host]
+ if {$oldHost != $thisHost} {
 catch [list $zz disconnect]
 
 set sessionWait 0
- if {[catch [list $zz connect $host]]} {
- displayError "Cannot connect to target" $host
+ if {[catch [list $zz connect $thisHost]]} {
+ displayError "Cannot connect to target" $thisHost
 return 0
 } elseif {$sessionWait == 0} {
 if {[catch {egw_wait sessionWait 300}]} {
 		$zz disconnect
- displayError "Cannot connect to target" $host
+ displayError "Cannot connect to target" $thisHost
 return 0
 }
 if {$sessionWait != 1} {
- displayError "Cannot connect to target" $host
+ displayError "Cannot connect to target" $thisHost
 return 0
 }
 }
 $zz idAuthentication $idAuth
 set sessionWait 0
 if {[catch {$zz init}]} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
 	 $zz disconnect
 return 0
 }
 if {[catch {egw_wait sessionWait 60}]} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
 	 $zz disconnect
 return 0
 }
 if {$sessionWait != "1"} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
 	 $zz disconnect
 return 0
 }
 if {![$zz initResult]} {
 set u [$zz userInformationField]
 $zz disconnect
- displayError "Cannot initialize target $host" $u
+ displayError "Cannot initialize target $thisHost" $u
 return 0
 }
 } else {
@@ -720,6 +722,7 @@ proc z39search {setNo piggy tno elements} {
 $zz.$setNo mediumSetPresentNumber 0
 }
 set sessionWait 0
+ egw_log debug "search: $query"
 $zz.$setNo search $query
 
 if {[catch {egw_wait sessionWait 600}]} {
@@ -797,7 +800,8 @@ proc z39msearch {setNo piggy elements} {
 if {[catch {set oldHost [z39$i connect]}]} {
 set oldHost ""
 }
- if {$oldHost != $host} {
+ set thisHost [splitHostSpec $host]
+ if {$oldHost != $thisHost} {
 catch {z39$i disconnect}
 }
 z39$i callback [list connect-m-response $i]
@@ -807,14 +811,15 @@ proc z39msearch {setNo piggy elements} {
 for {set i 1} {$i <= $not} {incr i} {
 set oldHost [z39$i connect]
 set host $hist($setNo,$i,host)
- if {$oldHost == $host} {
+ set thisHost [splitHostSpec $host]
+ if {$oldHost == $thisHost} {
 set zstatus($i) 1
 continue
 }
 z39$i idAuthentication $hist($setNo,$i,idAuthentication)
- html "Connecting to target " $host " \n"
+ html "Connecting to target " $thisHost " \n"
 set zstatus($i) -1
- if {![catch {z39$i connect $host}]} {
+ if {![catch {z39$i connect $thisHost}]} {
 incr zleft
 } 
 }
@@ -826,7 +831,7 @@ proc z39msearch {setNo piggy elements} {
 }
 set zleft 0
 for {set i 1} {$i <= $not} {incr i} {
- html "host " $hist($setNo,$i,host) ": "
+ html "host " [splitHostSpec $hist($setNo,$i,host)] ": "
 if {$zstatus($i) >= 1} {
 html "ok \n"
 ir-set z39$i.$setNo z39$i
@@ -1109,3 +1114,16 @@ proc maintenance {} {
 html { This and the following pages are under construction and }
 html {will continue to be so until the end of January 1996.}
 }
+
+proc splitHostSpec {host} {
+ set i [string last . $host]
+ if {$i > 1} {
+ incr i -1
+ return [string range $host 0 $i]
+ }
+ return $host
+}
+
+proc mergeHostSpec {host databases} {
+ return ${host}.[join $databases -]
+}
diff --git a/www/ztargets.conf b/www/ztargets.conf
index b07aced..41b3b7f 100644
--- a/www/ztargets.conf
+++ b/www/ztargets.conf
@@ -1,14 +1,14 @@
-# $Id: ztargets.conf,v 1.18 1996/01/24 14:14:21 adam Exp $
+# $Id: ztargets.conf,v 1.19 1996/01/24 16:59:29 adam Exp $
 set commonFields {
 { Title {@attr 1=4} }
- { Author {@attr 1=1003} }
+ { Author {@attr 1=1} }
 { Abstract {@attr 1=62} }
 { Date {@attr 1=30} }
 { {Doc ID} {@attr 1=1032} }
 { All {@attr 1=1016} }
 }
 
-set targets(myriad.middlebury.edu) {
+set targets(myriad.middlebury.edu.MIDCAT) {
 Midcat
 MIDCAT
 { { Title {@attr 1=4} }
@@ -22,7 +22,7 @@ set targets(myriad.middlebury.edu) {
 1
 }
 
-set targets(rlg.stanford.edu) [list \
+set targets(rlg.stanford.edu.BKS-AMC-MAP-MDF-REC-SCO-SER-VIM-BIB) [list \
 rlg \
 {BKS AMC MAP MDF REC SCO SER VIM BIB} \
 $commonFields \
@@ -31,7 +31,7 @@ set targets(rlg.stanford.edu) [list \
 1
 ]
 
-set targets(z3950.bibsys.no:2100) [list \
+set targets(z3950.bibsys.no:2100.BIBSYS) [list \
 BIBSYS \
 BIBSYS \
 $commonFields \
@@ -40,7 +40,7 @@ set targets(z3950.bibsys.no:2100) [list \
 0 \
 ]
 
-set targets(dtbsun.dtv.dk:4501) [list \
+set targets(dtbsun.dtv.dk:4501.DEM) [list \
 Aleph \
 DEM \
 $commonFields \
@@ -49,7 +49,7 @@ set targets(dtbsun.dtv.dk:4501) [list \
 0 \
 ]
 
-set targets(dallas.ucd.ie:7777) {
+set targets(dallas.ucd.ie:7777.danbib) {
 DanBib
 danbib 
 {
@@ -66,7 +66,7 @@ set targets(dallas.ucd.ie:7777) {
 0 
 }
 
-set targets(dtbsun.dtv.dk:9999) {
+set targets(dtbsun.dtv.dk:9999.usgs-esdd-cd_rom-uah-www_dk) {
 Zebra
 {usgs esdd cd_rom iah www_dk} 
 {
@@ -83,7 +83,7 @@ set targets(dtbsun.dtv.dk:9999) {
 1
 }
 
-set targets(z3950.research.att.com.xx) [list \
+set targets(z3950.research.att.com.Default) [list \
 {AT&T Server} \
 Default \
 $commonFields \
@@ -92,7 +92,7 @@ set targets(z3950.research.att.com.xx) [list \
 1 \
 ]
 
-set targets(dranet.dra.com) [list \
+set targets(dranet.dra.com.drewdb) [list \
 {Dranet} \
 drewdb \
 $commonFields \
-- 
1.7.10.4