X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=client.tcl;h=08f84a9067f8dbabe9847d83db79aa9780657e73;hb=666316a92ba28594acd7e2611f3a05be34f14722;hp=0ec50f9a2afd06a70400694b73d1288eb48a702c;hpb=bbf493d419191bb2650c061f5f00a39f42cc272f;p=ir-tcl-moved-to-github.git diff --git a/client.tcl b/client.tcl index 0ec50f9..08f84a9 100644 --- a/client.tcl +++ b/client.tcl @@ -1,10 +1,35 @@ # IR toolkit for tcl/tk -# (c) Index Data 1995 +# (c) Index Data 1995-1996 # See the file LICENSE for details. # Sebastian Hammer, Adam Dickmeiss # # $Log: client.tcl,v $ -# Revision 1.90 1996-03-20 13:54:02 adam +# Revision 1.98 1996-11-14 17:11:04 adam +# Added Explain documentaion. +# +# Revision 1.97 1996/09/13 10:54:22 adam +# Started work on Explain in client. +# +# Revision 1.96 1996/08/09 15:30:18 adam +# Procedure destroyGW modified to handle multiple calls - probably an +# error introduced by tk4.1 patch level 1. +# +# Revision 1.95 1996/07/26 09:15:08 adam +# IrTcl version 1.2 patch level 1. +# +# Revision 1.94 1996/07/25 15:55:34 adam +# IrTcl version 1.2 release. +# +# Revision 1.93 1996/06/28 08:43:54 adam +# Moved towards version 1.2. +# +# Revision 1.92 1996/03/29 16:04:30 adam +# Work on GRS-1 presentation. +# +# Revision 1.91 1996/03/27 17:00:53 adam +# Fix: main defined when using Tk3.6; it shouldn't be. +# +# Revision 1.90 1996/03/20 13:54:02 adam # The Tcl_File structure is only manipulated in the Tk-event interface # in tkinit.c. # @@ -356,6 +381,12 @@ if {[tk4]} { set noFocus {} } +# Define dummy clock function if it is not there. +if {[catch {clock seconds}]} { + proc clock {args} { + return {} + } +} # Set monoFlag to 1 if screen is known not to support colors; otherwise # set monoFlag to 0 if {![tk4]} { @@ -392,6 +423,43 @@ set hotTargets {} set hotInfo {} set busy 0 +# profile: associative array with target profiles. +#indx exp description +# +# 0 T Target description +# 1 Host +# 2 Port +# 3 Authentication +# 4 Maximum Record Size +# 5 Preferred Messages Size +# 6 Comstack +# 7 D Databases available +# 8 T Result Sets support +# 9 RPN-Query support +# 10 CCL-Query support +# 11 Protocol (Z39/SR) +# 12 Window Number +# 13 LSLB Large Set Lower Bound +# 14 SSUB Small Set Upper Bound +# 15 MSPN Medium Set Present Number +# 16 Present Chunk - number of records to fetch in each present +# 17 Time of first define +# 18 Time of last init +# 19 Time of last explain +# 20 T Name in TargetInfo +# 21 T Recent News +# 22 T Max Result Sets +# 23 T Max Result Size +# 24 T Max Terms +# 25 D List of database info records +# 26 T Multiple Databases +# 27 T Welcome message +# +# +# Legend: +# T TargetInfo explain +# D DatabaseInfo explain + set profile(Default) {{} {} {210} {} 50000 30000 tcpip {} 1 {} {} Z39 1 2 0 0 4} set hostid Default set settingsChanged 0 @@ -439,12 +507,24 @@ proc tkerror err { bottom-buttons $w [list {Close} [list destroy $w]] 1 } +# Read tag set file (if present) +if {[file readable "${libdir}/tagsets.tcl"]} { + source "${libdir}/tagsets.tcl" +} + # Read the global configuration file. if {[file readable "clientrc.tcl"]} { source "clientrc.tcl" -} else { - if {[file readable "${libdir}/clientrc.tcl"]} { - source "${libdir}/clientrc.tcl" +} elseif {[file readable "${libdir}/clientrc.tcl"]} { + source "${libdir}/clientrc.tcl" +} + +# Make old definitions up-to-date. +foreach n [array names profile] { + set l [llength $profile($n)] + while {$l < 29} { + lappend profile($n) {} + incr l } } @@ -562,23 +642,12 @@ proc set-display-format {f} { # Procedure initBindings # Disables various default bindings for Text and Listbox widgets. proc initBindings {} { - set w Text - bind $w <1> {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} - bind $w <2> {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} - bind $w {} + global TextBinding + foreach e [bind Text] { + set TextBinding($e) [bind Text $e] + bind Text $e {} + } set w Listbox bind $w {} bind $w {} @@ -586,6 +655,16 @@ proc initBindings {} { set w Entry } +# Procedure TextEditable +# Apply "standard" events to a text widget. It should be editable now. +proc TextEditable {w} { + global TextBinding + + foreach e [array names TextBinding] { + bind $w $e $TextBinding($e) + } +} + # Procedure post-menu {wbutton wmenu} # wbutton button widget # wmenu menu widget @@ -606,7 +685,7 @@ proc post-menu {wbutton wmenu} { # See also topLevelG. proc destroyGW {w} { global windowGeometry - set windowGeometry($w) [wm geometry $w] + catch {set windowGeometry($w) [wm geometry $w]} } # Procedure topLevelG @@ -720,11 +799,11 @@ proc cancel-operation {} { proc show-target {target base} { global profile - if {$target == ""} { + if {![string length $target]} { .bot.a.target configure -text "" return } - if {$base == ""} { + if {![string length $base]} { .bot.a.target configure -text "$target" } else { .bot.a.target configure -text "$target - $base" @@ -788,6 +867,8 @@ proc show-status {status b sb} { .mid.search configure -state normal if {$scanEnable} { .mid.scan configure -state normal + } else { + configure-disable-e .top.service.m 3 } if {$setNo == 0} { configure-disable-e .top.service.m 1 @@ -1134,7 +1215,7 @@ proc set-target-hotlist {olen} { foreach e $hotTargets { set target [lindex $e 0] set base [lindex $e 1] - if {$base == ""} { + if {![string length $base]} { .top.target.m add command -label "$i $target" -command \ [list reopen-target $target {}] } else { @@ -1168,7 +1249,7 @@ proc define-target-action {} { global profile set target [.target-define.top.target.entry get] - if {$target == ""} { + if {![string length $target]} { return } foreach n [array names profile] { @@ -1211,8 +1292,7 @@ proc fail-response {target} { # IrTcl connect response handler. proc connect-response {target base} { dputs "connect-response" - show-target $target $base - init-request + init-request $target $base } # Procedure open-target {target base} @@ -1224,54 +1304,58 @@ proc open-target {target base} { global hostid global presentChunk + set desc [lindex $profile($target) 0] + if {[string length $desc]} { + .data.record insert end $desc + } else { + .data.record insert end $target + } + .data.record insert end "\n\n" + z39 disconnect z39 comstack [lindex $profile($target) 6] z39 protocol [lindex $profile($target) 11] - z39 idAuthentication [lindex $profile($target) 3] + eval z39 idAuthentication [lindex $profile($target) 3] z39 maximumRecordSize [lindex $profile($target) 4] z39 preferredMessageSize [lindex $profile($target) 5] - dputs "maximumRecordSize=" - dputs [z39 maximumRecordSize] - dputs "preferredMessageSize=" - dputs [z39 preferredMessageSize] + dputs "maximumRecordSize=[z39 maximumRecordSize]" + dputs "preferredMessageSize=[z39 preferredMessageSize]" show-status Connecting 1 0 - if {$base == ""} { - z39 databaseNames [lindex [lindex $profile($target) 7] 0] - } else { - z39 databaseNames $base - } set x [lindex $profile($target) 13] - if {$x == ""} { + if {![string length $x]} { set x 2 } z39 largeSetLowerBound $x - + set x [lindex $profile($target) 14] - if {$x == ""} { + if {![string length $x]} { set x 0 } z39 smallSetUpperBound $x - + set x [lindex $profile($target) 15] - if {$x == ""} { + if {![string length $x]} { set x 0 } z39 mediumSetPresentNumber $x set presentChunk [lindex $profile($target) 16] - if {$presentChunk == ""} { + if {![string length $presentChunk]} { set presentChunk 4 } z39 failback [list fail-response $target] z39 callback [list connect-response $target $base] + show-target $target $base update idletasks set err [catch { z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2] } errorMessage] if {$err} { + set hostid Default tkerror $errorMessage show-status "Not connected" 0 {} + show-target {} {} return } set hostid $target @@ -1358,14 +1442,14 @@ proc load-set {} { # Procedure init-request # Sends an initialize request to the target. This procedure is called # when a connect has been established. -proc init-request {} { +proc init-request {target base} { global cancelFlag if {$cancelFlag} { close-target return } - z39 callback {init-response} + z39 callback [list init-response $target $base] show-status Initializing 1 {} set err [catch {z39 init} errorMessage] if {$err} { @@ -1378,28 +1462,61 @@ proc init-request {} { # Handles and incoming init-response. The service buttons # are enabled. The global $scanEnable indicates whether the target # supports scan. -proc init-response {} { - global cancelFlag - global scanEnable +proc init-response {target base} { + global cancelFlag profile + global scanEnable settingsChanged - dputs {init-reponse} + dputs {init-response} apduDump if {$cancelFlag} { close-target return } if {![z39 initResult]} { - show-status Ready 0 1 set u [z39 userInformationField] close-target tkerror "Connection rejected by target: $u" } else { - if {[lsearch [z39 options] scan] >= 0} { - set scanEnable 1 - } else { - set scanEnable 0 - } - show-status Ready 0 1 + explain-check $target [list ready-response $base] + } +} + +# Procedure explain-check +# Stub function to check explain. May be overwritten later. +proc explain-check {target response} { + eval $response [list $target] +} + +# Procedure ready-response +# Called after a target has been initialized and, possibly, explained +proc ready-response {base target} { + global profile settingsChanged scanEnable + + if {![string length $base]} { + set base [lindex [lindex $profile($target) 7] 0] + } + if {![string length $base]} { + set base Default + } + z39 databaseNames $base + set profile($target) [lreplace $profile($target) 18 18 [clock seconds]] + set settingsChanged 1 + if {[lsearch [z39 options] scan] >= 0} { + set scanEnable 1 + } else { + set scanEnable 0 + } + cascade-dblist $target $base + show-target $target $base + show-message {} + show-status Ready 0 1 + + .data.record insert end [lindex $profile($target) 27] + .data.record insert end "\n" + set data [lindex $profile($target) 21] + if {[string length $data]} { + .data.record insert end "News:\n" + .data.record insert end "$data\n" } } @@ -1421,8 +1538,8 @@ proc search-request {bflag} { global elementSetNames set target $hostid - - if {[z39 connect] == ""} { + + if {![string length [z39 connect]]} { return } dputs "search-request" @@ -1440,7 +1557,7 @@ proc search-request {bflag} { set delayRequest {} set query [index-query] - if {$query==""} { + if {![string length $query]} { return } incr setNoLast @@ -1462,12 +1579,12 @@ proc search-request {bflag} { } dputs Setting dputs $recordSyntax - if {$recordSyntax == "None" } { + if {![string compare $recordSyntax None]} { z39.$setNo preferredRecordSyntax {} } else { z39.$setNo preferredRecordSyntax $recordSyntax } - if {$elementSetNames == "None" } { + if {![string compare $elementSetNames None]} { z39.$setNo elementSetNames {} z39.$setNo smallSetElementSetNames {} z39.$setNo mediumSetElementSetNames {} @@ -1588,7 +1705,7 @@ proc scan-term-h {attr} { z39.scan numberOfTermsRequested 5 z39.scan preferredPositionInResponse 1 dputs "${attr} \{${scanTerm}\}" - if {$scanTerm == ""} { + if {![string length $scanTerm]} { z39.scan scan "${attr} 0" } else { z39.scan scan "${attr} \{${scanTerm}\}" @@ -1640,7 +1757,7 @@ proc scan-response {attr start toget} { z39.scan preferredPositionInResponse 1 set scanTerm $nScanTerm dputs "${attr} \{${scanTerm}\}" - if {$scanTerm == ""} { + if {![string length $scanTerm]} { z39.scan scan "${attr} 0" } else { z39.scan scan "${attr} \{${scanTerm}\}" @@ -1818,12 +1935,13 @@ proc search-response {} { set setMax [z39.$setNo resultCount] show-status Ready 0 1 set status [z39.$setNo responseStatus] - if {[lindex $status 0] == "NSD"} { + if {![string compare [lindex $status 0] NSD]} { z39.$setNo nextResultSetPosition 0 set code [lindex $status 1] set msg [lindex $status 2] set addinfo [lindex $status 3] tkerror "NSD$code: $msg: $addinfo" + dputs "xxxxxxxxxxxxxxx" return } show-message "${setMax} hits" @@ -1834,7 +1952,7 @@ proc search-response {} { show-status Ready 0 1 set l [format "%-4d %7d" $setNo $setMax] .top.rset.m add command -label $l \ - -command [list add-title-lines $setNo 10000 1] + -command [list recall-set $setNo] if {$setMax > 20} { set setMax 20 } @@ -1894,7 +2012,7 @@ proc present-more {number} { show-status Ready 0 1 return } - if {$number == ""} { + if {![string length $number]} { set setMax $max } else { incr setMax $number @@ -1903,7 +2021,7 @@ proc present-more {number} { } } z39 callback {present-response} - + set toGet [expr $setMax - $setOffset + 1] if {$toGet <= 0} { return @@ -1921,6 +2039,12 @@ proc init-title-lines {} { .data.record delete 0.0 end } +# Procedure recall-set {setno} +# setno Set number to recall +proc recall-set {setno} { + add-title-lines $setno 10000 1 +} + # Procedure add-title-lines {setno no offset} # setno Set number # no Number of records @@ -1950,7 +2074,7 @@ proc add-title-lines {setno no offset} { for {set i 0} {$i < $no} {incr i} { set o [expr $i + $offset] set type [z39.$setno type $o] - if {$type == ""} { + if {![string length $type]} { dputs "no more at $o" break } @@ -1995,7 +2119,7 @@ proc present-response {} { return } set status [z39.$setNo responseStatus] - if {[lindex $status 0] == "NSD"} { + if {![string compare [lindex $status 0] NSD]} { show-status Ready 0 1 set code [lindex $status 1] set msg [lindex $status 2] @@ -2142,11 +2266,17 @@ proc protocol-setup-action {target w} { lappend dataBases [$w.top.databases.list get $i] } set wno [lindex $profile($target) 12] + set timedef [lindex $profile($target) 17] + if {![string length $timedef]} { + set timedef [clock seconds] + } + + set idauth [$w.top.idAuthentication.entry get] set profile($target) [list [$w.top.description.entry get] \ [$w.top.host.entry get] \ [$w.top.port.entry get] \ - [$w.top.idAuthentication.entry get] \ + $idauth \ $targetS($target,MRS) \ $targetS($target,PMS) \ $targetS($target,csType) \ @@ -2159,7 +2289,10 @@ proc protocol-setup-action {target w} { $targetS($target,LSLB) \ $targetS($target,SSUB) \ $targetS($target,MSPN) \ - $targetS($target,presentChunk) ] + $targetS($target,presentChunk) \ + $timedef \ + {} \ + {} ] cascade-target-list delete-target-hotlist $target @@ -2222,6 +2355,7 @@ proc add-database {target wp} { focus $oldFocus } + # Procedure delete-database {target w} # target target to be defined # w top level widget for the target definition @@ -2265,7 +2399,7 @@ proc protocol-setup {target} { top-down-window $w - if {$target == ""} { + if {![string length $target]} { set target Default } dputs target @@ -2275,6 +2409,7 @@ proc protocol-setup {target} { frame $w.top.host frame $w.top.port frame $w.top.idAuthentication + frame $w.top.cs-type -relief ridge -border 2 frame $w.top.protocol -relief ridge -border 2 frame $w.top.query -relief ridge -border 2 @@ -2302,7 +2437,7 @@ proc protocol-setup {target} { set targetS($target,CCL) [lindex $profile($target) 9] set targetS($target,ResultSets) [lindex $profile($target) 10] set targetS($target,protocolType) [lindex $profile($target) 11] - if {$targetS($target,protocolType) == ""} { + if {![string length $targetS($target,protocolType)]} { set targetS($target,protocolType) Z39 } set targetS($target,LSLB) [lindex $profile($target) 13] @@ -2311,6 +2446,7 @@ proc protocol-setup {target} { set targetS($target,presentChunk) [lindex $profile($target) 16] set targetS($target,MRS) [lindex $profile($target) 4] set targetS($target,PMS) [lindex $profile($target) 5] + # Databases .... pack $w.top.databases -side left -pady 2 -padx 2 -expand yes -fill both @@ -2404,7 +2540,7 @@ proc advanced-setup {target b} { top-down-window $w - if {$target == ""} { + if {![string length $target]} { set target Default } dputs target @@ -2511,6 +2647,25 @@ proc database-select {} { focus $oldFocus } +# Procedure cascase-dblist-select +proc cascade-dblist-select {target db} { + show-target $target $db + z39 databaseNames $db +} + +# Procedure cascade-dblist +# Makes the Service/database list with proper databases for the target +proc cascade-dblist {target base} { + global profile + + set w .top.service.m.dblist + $w delete 0 200 + foreach db [lindex $profile($target) 7] { + $w add command -label $db \ + -command [list cascade-dblist-select $target $db] + } +} + # Procedure cascade-target-list # Makes all target/databases available in the Target|Connect # menu as well as all targets in the Target|Setup menu. @@ -2718,8 +2873,10 @@ proc save-settings {} { global queryTypes global queryButtons global queryInfo - - if {![file writable "${libdir}/clientrc.tcl"]} { + + if {[file exists clientrc.tcl]} { + set f [open "clientrc.tcl" w] + } elseif {![file writable "${libdir}/clientrc.tcl"]} { set a [alert "Cannot open ${libdir}/clientrc.tcl for writing. Do you \ wish to save clientrc.tcl in the current directory instead?"] if {! $a} { @@ -2732,9 +2889,11 @@ proc save-settings {} { puts $f "# Setup file" foreach n [array names profile] { + puts -nonewline $f "set \{profile($n)\} \{" puts -nonewline $f $profile($n) puts $f "\}" + puts $f {} } puts -nonewline $f "set queryTypes \{" puts -nonewline $f $queryTypes @@ -2787,16 +2946,12 @@ proc alert-action {} { } # Procedure exit-action -# This procedure is called if the user tries to exit without saving the -# system settings. +# This procedure is called if the user exists the application proc exit-action {} { global settingsChanged if {$settingsChanged} { - set a [alert "you haven't saved your settings. Do you wish to save?"] - if {$a} { - save-settings - } + save-settings } save-geometry exit 0 @@ -3395,7 +3550,7 @@ proc query-edit-index {queryNo} { set w .query-setup set i [lindex [$w.top.index.list curselection] 0] - if {$i == ""} { + if {![string length $i]} { return } set attr [lindex $queryInfoTmp $i] @@ -3413,7 +3568,7 @@ proc query-delete-index {queryNo} { set w .query-setup set i [lindex [$w.top.index.list curselection] 0] - if {$i == ""} { + if {![string length $i]} { return } set queryInfoTmp [lreplace $queryInfoTmp $i $i] @@ -3716,14 +3871,13 @@ proc search-fields {w buttondefs} { $w.0 configure -background red } -# Init: The geometry information for the main window is set if -# saved in the windowGeometry - array. -if {[info exists windowGeometry(.)]} { - set g $windowGeometry(.) - if {$g != ""} { - wm geometry . $g - } -} +# Init: The geometry information for the main window is set - either +# to a default value or to the value in windowGeometry(.) +if {[catch {set g $windowGeometry(.)}]} { + wm geometry . 420x340 +} else { + wm geometry . $g +} # Init: Presentation formats are read. read-formats @@ -3739,20 +3893,20 @@ pack .data -side top -fill both -expand yes pack .bot -fill x # Init: Definition of File menu. -menubutton .top.file -text "File" -menu .top.file.m +menubutton .top.file -text File -menu .top.file.m menu .top.file.m -.top.file.m add command -label "Save settings" -command {save-settings} +.top.file.m add command -label {Save settings} -command {save-settings} .top.file.m add separator -.top.file.m add command -label "Exit" -command {exit-action} +.top.file.m add command -label Exit -command {exit-action} # Init: Definition of Target menu. -menubutton .top.target -text "Target" -menu .top.target.m +menubutton .top.target -text Target -menu .top.target.m menu .top.target.m -.top.target.m add cascade -label "Connect" -menu .top.target.m.clist -.top.target.m add command -label "Disconnect" -command {close-target} -.top.target.m add command -label "About" -command {about-target} -.top.target.m add cascade -label "Setup" -menu .top.target.m.slist -.top.target.m add command -label "Setup new" -command {define-target-dialog} +.top.target.m add cascade -label Connect -menu .top.target.m.clist +.top.target.m add command -label Disconnect -command {close-target} +.top.target.m add command -label About -command {about-target} +.top.target.m add cascade -label Setup -menu .top.target.m.slist +.top.target.m add command -label {Setup new} -command {define-target-dialog} .top.target.m add separator set-target-hotlist 0 @@ -3764,44 +3918,46 @@ menu .top.target.m.slist cascade-target-list # Init: Definition of Service menu. -menubutton .top.service -text "Service" -menu .top.service.m +menubutton .top.service -text Service -menu .top.service.m menu .top.service.m -.top.service.m add command -label "Database" -command {database-select} -.top.service.m add cascade -label "Present" -menu .top.service.m.present +.top.service.m add cascade -label Database -menu .top.service.m.dblist +.top.service.m add cascade -label Present -menu .top.service.m.present menu .top.service.m.present -.top.service.m.present add command -label "10 More" \ +.top.service.m.present add command -label {10 More} \ -command [list present-more 10] -.top.service.m.present add command -label "All" \ +.top.service.m.present add command -label All \ -command [list present-more {}] -.top.service.m add command -label "Search" -command {search-request 0} -.top.service.m add command -label "Scan" -command {scan-request} +.top.service.m add command -label Search -command {search-request 0} +.top.service.m add command -label Scan -command {scan-request} .top.service configure -state disabled -menubutton .top.rset -text "Set" -menu .top.rset.m +menu .top.service.m.dblist + +menubutton .top.rset -text Set -menu .top.rset.m menu .top.rset.m -.top.rset.m add command -label "Load" -command {load-set} +.top.rset.m add command -label Load -command {load-set} .top.rset.m add separator # Init: Definition of the Options menu. -menubutton .top.options -text "Options" -menu .top.options.m +menubutton .top.options -text Options -menu .top.options.m menu .top.options.m -.top.options.m add cascade -label "Query" -menu .top.options.m.query -.top.options.m add cascade -label "Format" -menu .top.options.m.formats -.top.options.m add cascade -label "Wrap" -menu .top.options.m.wrap -.top.options.m add cascade -label "Syntax" -menu .top.options.m.syntax -.top.options.m add cascade -label "Elements" -menu .top.options.m.elements -.top.options.m add radiobutton -label "Debug" -variable debugMode -value 1 +.top.options.m add cascade -label Query -menu .top.options.m.query +.top.options.m add cascade -label Format -menu .top.options.m.formats +.top.options.m add cascade -label Wrap -menu .top.options.m.wrap +.top.options.m add cascade -label Syntax -menu .top.options.m.syntax +.top.options.m add cascade -label Elements -menu .top.options.m.elements +.top.options.m add radiobutton -label Debug -variable debugMode -value 1 # Init: Definition of the Options|Query menu. menu .top.options.m.query -.top.options.m.query add cascade -label "Select" \ +.top.options.m.query add cascade -label Select \ -menu .top.options.m.query.clist -.top.options.m.query add cascade -label "Edit" \ +.top.options.m.query add cascade -label Edit \ -menu .top.options.m.query.slist -.top.options.m.query add command -label "New" \ +.top.options.m.query add command -label New \ -command {query-new} -.top.options.m.query add cascade -label "Delete" \ +.top.options.m.query add cascade -label Delete \ -menu .top.options.m.query.dlist menu .top.options.m.query.slist @@ -3820,46 +3976,46 @@ foreach f $displayFormats { # Init: Definition of the Options|Wrap menu. menu .top.options.m.wrap -.top.options.m.wrap add radiobutton -label "Character" \ +.top.options.m.wrap add radiobutton -label Character \ -value char -variable textWrap -command {set-wrap char} -.top.options.m.wrap add radiobutton -label "Word" \ +.top.options.m.wrap add radiobutton -label Word \ -value word -variable textWrap -command {set-wrap word} -.top.options.m.wrap add radiobutton -label "None" \ +.top.options.m.wrap add radiobutton -label None \ -value none -variable textWrap -command {set-wrap none} # Init: Definition of the Options|Syntax menu. menu .top.options.m.syntax -.top.options.m.syntax add radiobutton -label "None" \ +.top.options.m.syntax add radiobutton -label None \ -value None -variable recordSyntax .top.options.m.syntax add separator -.top.options.m.syntax add radiobutton -label "USMARC" \ +.top.options.m.syntax add radiobutton -label USMARC \ -value USMARC -variable recordSyntax -.top.options.m.syntax add radiobutton -label "UNIMARC" \ +.top.options.m.syntax add radiobutton -label UNIMARC \ -value UNIMARC -variable recordSyntax -.top.options.m.syntax add radiobutton -label "UKMARC" \ +.top.options.m.syntax add radiobutton -label UKMARC \ -value UKMARC -variable recordSyntax -.top.options.m.syntax add radiobutton -label "DANMARC" \ +.top.options.m.syntax add radiobutton -label DANMARC \ -value DANMARC -variable recordSyntax -.top.options.m.syntax add radiobutton -label "FINMARC" \ +.top.options.m.syntax add radiobutton -label FINMARC \ -value FINMARC -variable recordSyntax -.top.options.m.syntax add radiobutton -label "NORMARC" \ +.top.options.m.syntax add radiobutton -label NORMARC \ -value NORMARC -variable recordSyntax -.top.options.m.syntax add radiobutton -label "PICAMARC" \ +.top.options.m.syntax add radiobutton -label PICAMARC \ -value PICAMARC -variable recordSyntax .top.options.m.syntax add separator -.top.options.m.syntax add radiobutton -label "SUTRS" \ +.top.options.m.syntax add radiobutton -label SUTRS \ -value SUTRS -variable recordSyntax .top.options.m.syntax add separator -.top.options.m.syntax add radiobutton -label "GRS1" \ +.top.options.m.syntax add radiobutton -label GRS1 \ -value GRS1 -variable recordSyntax # Init: Definition of the Options|Elements menu. menu .top.options.m.elements -.top.options.m.elements add radiobutton -label "Unspecified" \ +.top.options.m.elements add radiobutton -label Unspecified \ -value None -variable elementSetNames -.top.options.m.elements add radiobutton -label "Full" \ +.top.options.m.elements add radiobutton -label Full \ -value F -variable elementSetNames -.top.options.m.elements add radiobutton -label "Brief" \ +.top.options.m.elements add radiobutton -label Brief \ -value B -variable elementSetNames # Init: Definition of Help menu. @@ -3889,13 +4045,14 @@ pack .mid.search .mid.scan .mid.present .mid.clear -side left \ -fill y -pady 1 # Init: Define record area in main window. -text .data.record -font fixed -height 2 -width 20 -wrap none -borderwidth 0 -relief flat \ - -yscrollcommand [list .data.scroll set] -wrap $textWrap +text .data.record -font fixed -height 2 -width 20 -wrap none -borderwidth 0 \ + -relief flat -yscrollcommand [list .data.scroll set] -wrap $textWrap scrollbar .data.scroll -command [list .data.record yview] if {[tk4]} { .data.record configure -takefocus 0 .data.scroll configure -takefocus 0 } + pack .data.scroll -side right -fill y pack .data.record -expand yes -fill both initBindings @@ -3957,12 +4114,20 @@ if {[catch {ir z39}]} { puts "ok" } +if {[file exists ${libdir}/explain.tcl]} { + source ${libdir}/explain.tcl +} + +if {[file exists ${libdir}/setup.tcl]} { + source ${libdir}/setup.tcl +} + # Init: Uncomment this line if you wan't to enable logging. -z39 logLevel all {} irtcl.log +#z39 logLevel all # Init: If hostid is a valid target, a new connection will be established # immediately. -if {$hostid != "Default"} { +if {[string compare $hostid Default]} { catch {open-target $hostid $hostbase} }