From cfd819456dfc0d73dc22eb2e3d102b4ca285030d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 24 Aug 1995 15:33:01 +0000 Subject: [PATCH] Minor changes. --- CHANGELOG | 11 +++++++++-- client.tcl | 60 ++++++++++++++++++++++++++++------------------------------ clientrc.tcl | 4 ++-- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 20b6be9..dd8e03e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -$Id: CHANGELOG,v 1.3 1995-07-20 08:09:35 adam Exp $ +$Id: CHANGELOG,v 1.4 1995-08-24 15:33:01 adam Exp $ 06/19/95 Release of ir-tcl-1.0b ------------------------------------------------------ @@ -24,8 +24,9 @@ $Id: CHANGELOG,v 1.3 1995-07-20 08:09:35 adam Exp $ 06/26/95 ir-tk doesn't read client.tcl when no options are given. Instead it works like wish. The demonstrating client is named 'irclient' when installed in the directory with executables. ------------------------------------------------------- + 06/26/95 Release of ir-tcl-1.0b1 +------------------------------------------------------ 06/27/95 Bug fix. The present response didn't always get proper result-set info. @@ -41,3 +42,9 @@ $Id: CHANGELOG,v 1.3 1995-07-20 08:09:35 adam Exp $ 06/30/95 The interpretation of MARC records is a little less strict, i.e. a larger set of records are treated as being MARC. + +08/04/95 Request queue implemented. + +08/24/95 Modified to work with new version of yaz 1.0b3 + +08/24/95 Release of ir-tcl-1.0b2 diff --git a/client.tcl b/client.tcl index 21e1947..bac1b70 100644 --- a/client.tcl +++ b/client.tcl @@ -4,7 +4,10 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: client.tcl,v $ -# Revision 1.63 1995-08-04 13:20:48 adam +# Revision 1.64 1995-08-24 15:33:02 adam +# Minor changes. +# +# Revision 1.63 1995/08/04 13:20:48 adam # Buttons at the bottom are slightly smaller. # # Revision 1.62 1995/08/04 11:32:37 adam @@ -225,12 +228,16 @@ # if {$tk_version == "3.6"} { - set tk4 0 + proc tk4 {} { + return 0 + } } else { - set tk4 1 + proc tk4 {} { + return 1 + } } -if {$tk4} { +if {[tk4]} { proc configure-enable-e {w n} { incr n $w entryconfigure $n -state normal @@ -250,7 +257,7 @@ if {$tk4} { set noFocus {} } -if {! $tk4} { +if {![tk4]} { if {[tk colormodel .] == "color"} { set monoFlag 0 } else { @@ -822,10 +829,9 @@ proc delete-target-hotlist {target} { proc set-target-hotlist {olen} { global hotTargets - global tk4 if {$olen > 0} { - if {$tk4} { + if {[tk4]} { .top.target.m delete 7 [expr 7+$olen] } else { .top.target.m delete 6 [expr 6+$olen] @@ -932,7 +938,6 @@ proc close-target {} { global cancelFlag global setNo global setNoLast - global tk4 set cancelFlag 0 set setNo 0 @@ -946,7 +951,7 @@ proc close-target {} { show-message {} configure-disable-e .top.target.m 1 configure-disable-e .top.target.m 2 - if {$tk4} { + if {[tk4]} { .top.rset.m delete 2 last } else { .top.rset.m delete 1 last @@ -1567,12 +1572,11 @@ proc right-cursor {w} { } proc bind-fields {list returnAction escapeAction} { - global tk4 set max [expr [llength $list]-1] for {set i 0} {$i < $max} {incr i} { bind [lindex $list $i] $returnAction bind [lindex $list $i] $escapeAction - if {!$tk4} { + if {![tk4]} { bind [lindex $list $i] \ [list focus [lindex $list [expr $i+1]]] bind [lindex $list $i] \ @@ -1583,7 +1587,7 @@ proc bind-fields {list returnAction escapeAction} { } bind [lindex $list $i] $returnAction bind [lindex $list $i] $escapeAction - if {!$tk4} { + if {![tk4]} { bind [lindex $list $i] [list focus [lindex $list 0]] bind [lindex $list $i] [list left-cursor [lindex $list $i]] bind [lindex $list $i] [list right-cursor [lindex $list $i]] @@ -1816,8 +1820,7 @@ proc protocol-setup {target} { -command [list add-database $target] button $w.top.databases.delete -text "Delete" \ -command [list delete-database $target] - global tk4 - if {! $tk4} { + if {! [tk4]} { listbox $w.top.databases.list -geometry 20x6 \ -yscrollcommand "$w.top.databases.scroll set" } else { @@ -2458,7 +2461,6 @@ proc use-attr {init} { {Content type} 1034 {Anywhere} 1035 } - global tk4 set w .index-setup global useTmpValue set l [llength $attr] @@ -2474,7 +2476,7 @@ proc use-attr {init} { } incr lno } - if {$tk4} { + if {[tk4]} { $w.top.use.list selection clear 0 end $w.top.use.list selection set $s $s } else { @@ -2542,7 +2544,6 @@ proc index-setup {attr queryNo indexNo} { global completenessTmpValue global positionTmpValue global useTmpValue - global tk4 set relationTmpValue 0 set truncationTmpValue 0 set structureTmpValue 0 @@ -2597,7 +2598,7 @@ proc index-setup {attr queryNo indexNo} { pack $w.top.use -side left -pady 6 -padx 6 -fill y label $w.top.use.label -text "Use" - if {$tk4} { + if {[tk4]} { listbox $w.top.use.list -width 26 \ -yscrollcommand "$w.top.use.scroll set" } else { @@ -2693,7 +2694,6 @@ proc query-setup {queryNo} { global queryButtonsTmp global queryInfoTmp global queryIndexTmp - global tk4 set queryIndexTmp 0 set queryName [lindex $queryTypes $queryNo] @@ -2736,7 +2736,7 @@ proc query-setup {queryNo} { pack $w.top.index.list -side left -fill both -expand yes -padx 2 -pady 2 pack $w.top.index.scroll -side right -fill y -padx 2 -pady 2 - if {$tk4} { + if {[tk4]} { $w.top.index.list selection clear 0 end $w.top.index.list selection set 0 0 } else { @@ -2815,20 +2815,18 @@ proc index-query {} { proc index-focus-in {w i} { global curIndexEntry - global tk4 - if {! $tk4} { + if {! [tk4]} { $w.$i configure -background red } set curIndexEntry $i } proc index-lines {w realOp buttonInfo queryInfo handle} { - global tk4 set i 0 foreach b $buttonInfo { if {! [winfo exists $w.$i]} { - if {$tk4} { + if {[tk4]} { frame $w.$i -border 0 } else { frame $w.$i -background white -border 1 @@ -2845,7 +2843,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} { pack $w.$i.l -side left pack $w.$i.e -side left -fill x -expand yes pack $w.$i -side top -fill x -padx 2 -pady 2 - if {!$tk4} { + if {![tk4]} { bind $w.$i.e [list left-cursor $w.$i.e] bind $w.$i.e [list right-cursor $w.$i.e] } @@ -2865,7 +2863,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} { if {! $realOp} { return } - if {! $tk4} { + if {! [tk4]} { set j 0 incr i -1 while {$j < $i} { @@ -2875,7 +2873,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} { } } if {$i >= 0} { - if {! $tk4} { + if {! [tk4]} { bind $w.$i.e "focus $w.0.e" } focus $w.0.e @@ -3057,12 +3055,12 @@ button .mid.present -width 7 -text {Present} -command [list present-more 10] \ button .mid.clear -width 7 -text {Clear} -command index-clear pack .mid.search .mid.scan .mid.present .mid.clear -side left \ - -fill y -padx 5 -pady 3 + -fill y -padx 4 -pady 2 text .data.record -height 2 -width 20 -wrap none \ -yscrollcommand [list .data.scroll set] -wrap $textWrap scrollbar .data.scroll -command [list .data.record yview] -if {$tk4} { +if {[tk4]} { .data.record configure -takefocus 0 .data.scroll configure -takefocus 0 } @@ -3080,7 +3078,7 @@ if {! $monoFlag} { .data.record tag configure marc-data -foreground black button .bot.logo -bitmap @${libdir}/bitmaps/book1 -command cancel-operation -if {$tk4} { +if {[tk4]} { .bot.logo configure -takefocus 0 } frame .bot.a @@ -3098,7 +3096,7 @@ label .bot.a.message -text "" -width 15 -relief \ pack .bot.a.target -side top -anchor nw -padx 2 -pady 2 pack .bot.a.status .bot.a.set .bot.a.message \ - -side left -padx 2 -pady 2 + -side left -padx 2 -pady 2 -ipadx 1 -ipady 1 ir z39 z39 logLevel all diff --git a/clientrc.tcl b/clientrc.tcl index 2397bbc..49c8248 100644 --- a/clientrc.tcl +++ b/clientrc.tcl @@ -11,11 +11,11 @@ set {profile(DANBIB)} {{SR Target DANBIB} 0103/find2.denet.dk 4500 {} 8192 8192 set {profile(OCLC)} {{OCLC First search engine} z3950.oclc.org 210 {} 16384 8192 tcpip {ArticleFirst BiographyIndex BusinessPeriodicalsIndex} 1 {} {} Z39 9} set {profile(adad)} {a {} 210 {} 16384 8192 tcpip {} 1 {} {} Z39 26} set {profile(CARL)} {{CARL systems} Z3950.carl.org 210 {} 16384 8192 tcpip {ACC AIC AUR BEM CUB DPL DNU EPL FRC LAW LCC MCC MIN MPL NJC NWC OCC PPC PUE RDR RGU SPL TCC TKU UNC WYO} 1 {} {} Z39 11} -set {profile(Innovative)} {{Innovatives server: demo.iii.com} demo.iii.com 210 {} 16384 8192 tcpip DEFAULT 1 {} {} Z39 12} set {profile(CLSI)} {CLSI inet-gw.clsi.us.geac.com 210 {} 16384 8192 tcpip cl_default 1 {} {} Z39 13} +set {profile(Innovative)} {{Innovatives server: demo.iii.com} demo.iii.com 210 {} 16384 8192 tcpip DEFAULT 1 {} {} Z39 12} set {profile(AULS)} {{Acadia university} auls.acadiau.ca 210 {} 16384 8192 tcpip AULS 1 {} {} Z39 14} -set {profile(canberra)} {canberra canberra.cs.umass.edu 2110 {} 30000 30000 tcpip cacm_dots 1 {} {} Z39 25} set {profile(dranet)} {dranet dranet.dra.com 210 {} 16384 16384 tcpip drewdb 1 {} 1 Z39 15} +set {profile(canberra)} {canberra canberra.cs.umass.edu 2110 {} 30000 30000 tcpip cacm_dots 1 {} {} Z39 25} set queryTypes {Simple phrase} set queryButtons {{ {I 0} {I 1} {I 2} } {{I 0} {I 1} {I 0}}} set queryInfo {{ {Title {1=4}} {Author {1=1}} {Subject {1=21}} {Any {1=1016}}} {{Title 1=4 4=1 6=2} {Author 1=1003 4=1 6=2} {ISBN 1=7} {ISSN 1=8} {Year 1=30 4=4 6=2} {Any {}}}} -- 1.7.10.4