WWW/Z39.50 Gateway Scan " $host "

From df7b985601de6c729147a6fd6588adba6f905480 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 2 Jan 1996 10:52:25 +0000 Subject: [PATCH] In images Alt=... are defined. --- www/Makefile | 11 +++++--- www/query.egw | 7 +++-- www/search.egw | 82 +++++++++++++++++++----------------------------------- www/showfull.egw | 39 +++++++++++++++----------- www/targets.egw | 13 +++++++-- www/z39util.tcl | 8 +++--- 6 files changed, 77 insertions(+), 83 deletions(-) diff --git a/www/Makefile b/www/Makefile index a568940..83a69fb 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2,7 +2,10 @@ # Europagate, 1995 # # $Log: Makefile,v $ -# Revision 1.18 1995/12/20 16:31:30 adam +# 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. @@ -70,9 +73,9 @@ SHELL=/bin/sh # ZDEFS= -ZINC=-I../../yaz/include -ZLIB=../../yaz/lib/libyaz.a -MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a +#ZINC=-I../../yaz/include +ZLIB=-lyaz +MOSILIB=../../xtimosi/src/libmosi.a -lrfc LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB) #NETLIB=-lnsl -lsocket # diff --git a/www/query.egw b/www/query.egw index df9b0ba..0c4832d 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.20 1995/12/21 15:49:52 adam Exp $ +# $Id: query.egw,v 1.21 1996/01/02 10:52:26 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -180,10 +180,11 @@ proc ok-response {} {

{ - html {} + html {} html {} + html {">} }

diff --git a/www/search.egw b/www/search.egw index 7f1c0ef..0feff70 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.20 1995/12/22 14:21:15 adam Exp $ +# $Id: search.egw,v 1.21 1996/01/02 10:52:28 adam Exp $ proc perform-scan {} { global sessionId @@ -26,34 +26,7 @@ proc perform-scan {} { set hist($setNo,scanAttr) [lindex $termPlusAttr 1] set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0] - set hist($setNo,form,menu1) [wform menu1] - set hist($setNo,form,menu2) [wform menu2] - set hist($setNo,form,menu3) [wform menu3] - - set hist($setNo,form,entry1) [wform entry1] - set hist($setNo,form,entry2) [wform entry2] - set hist($setNo,form,entry3) [wform entry3] - - set hist($setNo,form,logic1) [wform logic1] - set hist($setNo,form,logic2) [wform logic2] - - set host $hist($setNo,host) - set databases [lindex $targets($host) 1] - - set b [wform base] - if {[wform baseall] != ""} { - set hist($setNo,database) $databases - } elseif {$b == ""} { - set hist($setNo,database) $databases - } else { - set hist($setNo,database) $b - } - set hist($setNo,maxPresent) [wform hits] - if {$hist($setNo,maxPresent) == ""} { - set hist($setNo,maxPresent) 30 - } set host $hist($setNo,host) - set databases [lindex $targets($host) 1] html " WWW/Z39.50 Gateway Scan " $host " \n" html "\n" @@ -98,16 +71,17 @@ proc buttons {setNo setMax startPos after} { html "

\n" if {$useIcons} { - html {} + html {} } if {$setMax < [z39.$setNo resultCount]} { html {} + html {">} } else { - html {">Next records} " | \n" + html {">Next Records} " | \n" } } if {$startPos != "" && $startPos != "1"} { @@ -116,25 +90,28 @@ proc buttons {setNo setMax startPos after} { html + [expr $startPos - $hist($setNo,maxPresent)] html + [expr $startPos - 1] if {$useIcons} { - html {">} + html {">} } else { - html {">Previous records} " | \n" + html {">Previous Records} " | \n" } } html {} + html {">} } else { - html {">New query} " | \n" + html {">New Query} " | \n" } html {} + html {">} } else { - html {">New target} + html {">New Target} } html "

\n" if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} { @@ -169,20 +146,6 @@ proc buttons {setNo setMax startPos after} { } else { catch {unset hist($setNo,hits)} } - if {[wform submit] == "Scan"} { - perform-scan - wabort - } - set query [build-query $hist($setNo,host) 3] - if {"x$query" == "x"} { - html " WWW/Z39.50 Gateway Search\n\n" - displayError "Empty query" \ - "You must specify at least one search word" - html "\n" - wabort - } - set hist($setNo,query) $query - set hist($setNo,form,menu1) [wform menu1] set hist($setNo,form,menu2) [wform menu2] set hist($setNo,form,menu3) [wform menu3] @@ -193,7 +156,7 @@ proc buttons {setNo setMax startPos after} { set hist($setNo,form,logic1) [wform logic1] set hist($setNo,form,logic2) [wform logic2] - + set host $hist($setNo,host) set databases [lindex $targets($host) 1] @@ -209,9 +172,22 @@ proc buttons {setNo setMax startPos after} { if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } + + if {[wform submit] == "Scan"} { + perform-scan + wabort + } + set query [build-query $hist($setNo,host) 3] + if {"x$query" == "x"} { + html " WWW/Z39.50 Gateway Search\n\n" + displayError "Empty query" \ + "You must specify at least one search word" + html "\n" + wabort + } + set hist($setNo,query) $query } set host $hist($setNo,host) - set databases [lindex $targets($host) 1] html " WWW/Z39.50 Gateway Search " $host " \n" html "\n" diff --git a/www/showfull.egw b/www/showfull.egw index aed8080..3286321 100644 --- a/www/showfull.egw +++ b/www/showfull.egw @@ -1,6 +1,6 @@ { -# $Id: showfull.egw,v 1.13 1995/12/21 15:49:52 adam Exp $ +# $Id: showfull.egw,v 1.14 1996/01/02 10:52:29 adam Exp $ proc buttons {setNo tno no format count host after} { global sessionId @@ -18,16 +18,17 @@ proc buttons {setNo tno no format count host after} { html "

\n" } if {$useIcons} { - html {} + html {} } if {$no < $count} { html {} + html {">} } else { - html {">Next record} " | \n" + html {">Next Record} " | \n" } } if {$no > 1} { @@ -35,9 +36,10 @@ proc buttons {setNo tno no format count host after} { html / $sessionId {/showfull.egw/} $setNo + $tno + html [expr $no - 1] + $format if {$useIcons} { - html {">} + html {">} } else { - html {">Previous record} " | \n" + html {">Previous Record} " | \n" } } @@ -46,16 +48,18 @@ proc buttons {setNo tno no format count host after} { if {$format == "full"} { html raw if {$useIcons} { - html {">} + html {">} } else { - html {">Raw format} " | \n" + html {">Raw Format} " | \n" } } else { html full if {$useIcons} { - html {">} + html {">} } else { - html {">Full format} " | \n" + html {">Full Format} " | \n" } } @@ -68,9 +72,10 @@ proc buttons {setNo tno no format count host after} { html $setNo + 1 html + $hist($setNo,maxPresent) if {$useIcons} { - html {">} + html {">} } else { - html {">Result set} " | \n" + html {">Result Set} " | \n" } html {} + html {">} } else { - html {">New query} " | \n" + html {">New Query} " | \n" } html {} + html {">} } else { - html {">New target} + html {">New Target} } html "

\n" if {!$useIcons && !$after && $no > 1} { diff --git a/www/targets.egw b/www/targets.egw index 9726f97..f954c23 100644 --- a/www/targets.egw +++ b/www/targets.egw @@ -1,6 +1,6 @@ { -# $Id: targets.egw,v 1.9 1995/12/21 15:49:53 adam Exp $ +# $Id: targets.egw,v 1.10 1996/01/02 10:52:30 adam Exp $ source /usr/local/etc/httpd/conf/ztargets.conf if {[info commands saveState] == ""} { source z39util.tcl @@ -14,10 +14,17 @@ -

Choose Z39.50 target

} [lindex $targets($t) 0] " \n" set desc [lindex $targets($t) 4] diff --git a/www/z39util.tcl b/www/z39util.tcl index 8035c60..3a2c694 100644 --- a/www/z39util.tcl +++ b/www/z39util.tcl @@ -1,5 +1,5 @@ # -# $Id: z39util.tcl,v 1.14 1995/12/22 14:21:16 adam Exp $ +# $Id: z39util.tcl,v 1.15 1996/01/02 10:52:32 adam Exp $ # proc saveState {} { uplevel #0 { @@ -858,7 +858,7 @@ proc z39history {} { if {![info exists nextSetNo]} { return } - html " History \n" + html " History \n" for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} { html { \n" - html {} + html {} html " " $msga " \n" if {$msgb != ""} { html " " $msgb " \n" @@ -892,4 +892,4 @@ proc displayError {msga msgb} { html " \n" } -set useIcons 1 \ No newline at end of file +set useIcons 1 -- 1.7.10.4

Choose Z39.50 target

Choose Z39.50 target

History

History

" $msga "

" $msgb "