# Sebastian Hammer, Adam Dickmeiss
#
# $Log: client.tcl,v $
-# Revision 1.43 1995-06-16 14:41:05 adam
+# Revision 1.74 1995-10-17 12:18:57 adam
+# Bug fix: when target connection closed, the connection was not
+# properly reestablished.
+#
+# Revision 1.73 1995/10/17 10:58:06 adam
+# More work on presentation formats.
+#
+# Revision 1.72 1995/10/16 17:00:52 adam
+# New setting: elementSetNames.
+# Various client improvements. Medium presentation format looks better.
+#
+# Revision 1.71 1995/10/13 15:35:27 adam
+# Relational operators may be used in search entries - changes
+# in proc index-query.
+#
+# Revision 1.70 1995/10/12 14:46:52 adam
+# Better record popup windows. Next/prev buttons in popup record windows.
+# The record position in the raw format is much more visible.
+#
+# Revision 1.69 1995/09/21 13:42:54 adam
+# Bug fixes.
+#
+# Revision 1.68 1995/09/21 13:11:49 adam
+# Support of dynamic loading.
+# Test script uses load command if necessary.
+#
+# Revision 1.67 1995/09/20 14:35:19 adam
+# Minor changes.
+#
+# Revision 1.66 1995/08/29 15:30:13 adam
+# Work on GRS records.
+#
+# Revision 1.65 1995/08/24 15:39:09 adam
+# Minor changes.
+#
+# 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
+# More work on output queue. Memory related routines moved
+# to mem.c
+#
+# Revision 1.61 1995/07/20 08:09:39 adam
+# client.tcl: Targets removed from hotTargets list when targets
+# are removed/modified.
+# ir-tcl.c: More work on triggerResourceControl.
+#
+# Revision 1.60 1995/06/30 16:30:19 adam
+# Minor changes.
+#
+# Revision 1.59 1995/06/29 14:06:25 adam
+# Another bug in install fixed. Configure searches for more versions of yaz.
+#
+# Revision 1.58 1995/06/29 12:34:06 adam
+# IrTcl now works with both tk4.0b4/tcl7.4b4 and tk3.6/tcl7.3
+#
+# Revision 1.57 1995/06/29 09:20:30 adam
+# Target entries in cascade menus are sorted.
+#
+# Revision 1.56 1995/06/27 19:03:48 adam
+# Bug fix in do_present in ir-tcl.c: p->set_child member weren't set.
+# nextResultSetPosition used instead of setOffset.
+#
+# Revision 1.55 1995/06/27 17:10:37 adam
+# Bug fix: install procedure didn't work on some systems.
+# Error turned up when clientrc.tcl was't present.
+#
+# Revision 1.54 1995/06/27 14:41:03 adam
+# Bug fix in search-response. Didn't always observe non-surrogate diagnostics.
+#
+# Revision 1.53 1995/06/26 12:40:09 adam
+# Client defines its own tkerror.
+# User may specify 'no preferredRecordSyntax'.
+#
+# Revision 1.52 1995/06/22 13:14:59 adam
+# Feature: SUTRS. Setting getSutrs implemented.
+# Work on display formats.
+# Preferred record syntax can be set by the user.
+#
+# Revision 1.51 1995/06/21 11:11:00 adam
+# Bug fix: libdir undefined in about-origin.
+#
+# Revision 1.50 1995/06/21 11:04:48 adam
+# Uses GNU autoconf 2.3.
+# Install procedure implemented.
+# boook bitmaps moved to sub directory bitmaps.
+#
+# Revision 1.49 1995/06/20 14:16:42 adam
+# More work on cancel mechanism.
+#
+# Revision 1.48 1995/06/20 08:07:23 adam
+# New setting: failInfo.
+# Working on better cancel mechanism.
+#
+# Revision 1.47 1995/06/19 14:05:29 adam
+# Bug fix: asked for SUTRS.
+#
+# Revision 1.46 1995/06/19 13:06:06 adam
+# New define: IR_TCL_VERSION.
+#
+# Revision 1.45 1995/06/19 08:08:44 adam
+# client.tcl: hotTargets now contain both database and target name.
+# ir-tcl.c: setting protocol edited. Errors in callbacks are logged
+# by logf(LOG_WARN, ...) calls.
+#
+# Revision 1.44 1995/06/16 14:55:18 adam
+# Book logo mirrored.
+#
+# Revision 1.43 1995/06/16 14:41:05 adam
# Scan line entries can be copied to a search entry.
#
# Revision 1.42 1995/06/16 12:28:13 adam
# First presentRequest attempts. Hot-target list.
#
#
+
+if {$tk_version == "3.6"} {
+ proc tk4 {} {
+ return 0
+ }
+} else {
+ proc tk4 {} {
+ return 1
+ }
+}
+
+if {[tk4]} {
+ proc configure-enable-e {w n} {
+ incr n
+ $w entryconfigure $n -state normal
+ }
+ proc configure-disable-e {w n} {
+ incr n
+ $w entryconfigure $n -state disabled
+ }
+ set noFocus [list -takefocus 0]
+} else {
+ proc configure-enable-e {w n} {
+ $w enable $n
+ }
+ proc configure-disable-e {w n} {
+ $w disable $n
+ }
+ set noFocus {}
+}
+
+if {![tk4]} {
+ if {[tk colormodel .] == "color"} {
+ set monoFlag 0
+ } else {
+ set monoFlag 1
+ }
+} else {
+ set monoFlag 0
+}
+
+set libdir LIBDIR
+if {[file readable bitmaps/book2]} {
+ set libdir .
+}
+if {! [file readable ${libdir}/bitmaps/book2]} {
+ puts "Cannot locate system files in ${libdir}. You must either run this"
+ puts "program from the source directory root of ir-tcl or you must assure"
+ puts "that it is installed - normally in /usr/local/lib/irtcl"
+ exit 1
+}
+
set hotTargets {}
set hotInfo {}
set busy 0
-set libDir ""
-
-set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} Z39 1}
set hostid Default
set settingsChanged 0
set setNo 0
-set lastSetNo 0
+set setNoLast 0
set cancelFlag 0
-set searchEnable 0
set scanEnable 0
-set fullMarcSeq 0
set displayFormat 1
set popupMarcdf 0
set textWrap word
+set recordSyntax None
+set elementSetNames None
+set delayRequest {}
set queryTypes {Simple}
set queryButtons { { {I 0} {I 1} {I 2} } }
set setOffset 0
set setMax 0
+proc tkerror err {
+ set w .tkerrorw
+
+ if {[winfo exists $w]} {
+ destroy $w
+ }
+ toplevel $w
+ wm title $w "Error"
+
+ place-force $w .
+ top-down-window $w
+
+ label $w.top.b -bitmap error
+ message $w.top.t -aspect 300 -text "Error: $err" \
+ -font -Adobe-Helvetica-Bold-R-Normal-*-180-*
+ pack $w.top.b $w.top.t -side left -padx 10 -pady 10
+
+ bottom-buttons $w [list {Close} [list destroy $w]] 1
+}
+
proc read-formats {} {
global displayFormats
- set formats [glob -nocomplain formats/*.tcl]
+ global libdir
+ if {[catch {set formats [glob -nocomplain ${libdir}/formats/*.tcl]}]} {
+ set formats ./formats/raw.tcl
+ }
foreach f $formats {
- source $f
- set l [expr [string length $f] - 5]
- lappend displayFormats [string range $f 8 $l]
+ if {[file readable $f]} {
+ source $f
+ set l [string length $f]
+ set f [string range $f [string length "${libdir}/formats/"] \
+ [expr $l - 5]]
+ lappend displayFormats $f
+ }
}
}
.data.record configure -wrap $m
}
+proc dputs {m} {
+ puts $m
+}
+
proc set-display-format {f} {
global displayFormat
global setNo
.bot.a.status configure -text "Reformatting"
}
update idletasks
- add-title-lines 0 10000 1
- if {!$busy} {
- .bot.a.status configure -text "Ready"
- }
+ add-title-lines -1 10000 1
}
proc initBindings {} {
if {[file readable "clientrc.tcl"]} {
source "clientrc.tcl"
+} else {
+ if {[file readable "${libdir}/clientrc.tcl"]} {
+ source "${libdir}/clientrc.tcl"
+ }
}
-if {[file readable "clientg.tcl"]} {
- source "clientg.tcl"
+if {[file readable "~/.clientrc.tcl"]} {
+ source "~/.clientrc.tcl"
}
set queryButtonsFind [lindex $queryButtons 0]
proc top-down-ok-cancel {w ok-action g} {
frame $w.bot.left -relief sunken -border 1
- pack $w.bot.left -side left -expand yes -ipadx 2 -ipady 2 -padx 5 -pady 5
- button $w.bot.left.ok -width 6 -text {Ok} \
+ pack $w.bot.left -side left -expand yes -ipadx 2 -ipady 2 -padx 1 -pady 1
+ button $w.bot.left.ok -width 4 -text {Ok} \
-command ${ok-action}
- pack $w.bot.left.ok -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3
- button $w.bot.cancel -width 6 -text {Cancel} \
+ pack $w.bot.left.ok -expand yes -ipadx 1 -ipady 1 -padx 2 -pady 2
+ button $w.bot.cancel -width 5 -text {Cancel} \
-command [list destroy $w]
pack $w.bot.cancel -side left -expand yes
set l [llength $buttonList]
frame $w.bot.$i -relief sunken -border 1
- pack $w.bot.$i -side left -expand yes -padx 5 -pady 5
+ pack $w.bot.$i -side left -expand yes -padx 2 -pady 2
button $w.bot.$i.ok -text [lindex $buttonList $i] \
-command [lindex $buttonList [expr $i+1]]
- pack $w.bot.$i.ok -expand yes -ipadx 3 -ipady 2 -padx 3 -pady 3 -side left
+ pack $w.bot.$i.ok -expand yes -padx 2 -pady 2 -side left
incr i 2
while {$i < $l} {
button $w.bot.$i -text [lindex $buttonList $i] \
-command [lindex $buttonList [expr $i+1]]
- pack $w.bot.$i -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
+ pack $w.bot.$i -expand yes -padx 2 -pady 2 -side left
incr i 2
}
if {$g} {
proc cancel-operation {} {
global cancelFlag
global busy
+ global delayRequest
- set cancelFlag 1
if {$busy} {
- show-status Canceling 0 {}
+ set cancelFlag 1
+ set delayRequest {}
+ show-status Cancel 0 1
}
}
-proc show-target {target} {
- .bot.a.target configure -text "$target"
+proc show-target {target base} {
+ global profile
+
+ if {$target == ""} {
+ .bot.a.target configure -text ""
+ return
+ }
+ if {$base == ""} {
+ .bot.a.target configure -text "$target"
+ } else {
+ .bot.a.target configure -text "$target - $base"
+ }
}
proc show-logo {v1} {
global busy
+ global libdir
+
if {$busy != 0} {
- incr v1 -1
- if {$v1==0} {
- set v1 9
+ incr v1
+ if {$v1==10} {
+ set v1 1
}
- .bot.logo configure -bitmap @book${v1}
+ .bot.logo configure -bitmap @${libdir}/bitmaps/book${v1}
after 140 [list show-logo $v1]
return
}
while {1} {
- .bot.logo configure -bitmap @book1
+ .bot.logo configure -bitmap @${libdir}/bitmaps/book1
tkwait variable busy
if {$busy} {
show-logo 1
proc show-status {status b sb} {
global busy
- global searchEnable
global scanEnable
global setOffset
global setMax
+ global setNo
.bot.a.status configure -text "$status"
if {$b == 1} {
if {$scanEnable} {
.mid.scan configure -state normal
}
- if {$setOffset > 0 && $setOffset <= $setMax} {
- .top.service.m enable 1
+ if {$setNo == 0} {
+ configure-disable-e .top.service.m 1
+ } elseif {[z39.$setNo nextResultSetPosition] > 0 &&
+ [z39.$setNo nextResultSetPosition] <= [z39.$setNo resultCount]} {
+ configure-enable-e .top.service.m 1
.mid.present configure -state normal
} else {
- .top.service.m disable 1
+ configure-disable-e .top.service.m 1
+ .mid.present configure -state disabled
}
if {[winfo exists .scan-window]} {
.scan-window.bot.2 configure -state normal
.scan-window.bot.4 configure -state normal
}
- set searchEnable 1
} else {
.top.service configure -state disabled
.mid.search configure -state disabled
.scan-window.bot.2 configure -state disabled
.scan-window.bot.4 configure -state disabled
}
- set searchEnable 0
}
}
}
proc popup-license {} {
+ global libdir
set w .popup-licence
toplevel $w
pack $w.top.s -side right -fill y
pack $w.top.t -expand yes -fill both
- set f [open "LICENSE" r]
- while {[gets $f buf] != -1} {
- $w.top.t insert end $buf
- $w.top.t insert end "\n"
- }
- close $f
+ if {[file readable "${libdir}/LICENSE"]} {
+ set f [open "${libdir}/LICENSE" r]
+ while {[gets $f buf] != -1} {
+ $w.top.t insert end $buf
+ $w.top.t insert end "\n"
+ }
+ close $f
+ }
bottom-buttons $w [list {Close} [list destroy $w]] 1
}
toplevel $w
wm title $w "About target"
+ place-force $w .
top-down-window $w
frame $w.top.a -relief ridge -border 2
}
proc about-origin-logo {n} {
+ global libdir
set w .about-origin-w
if {![winfo exists $w]} {
return
}
- incr n -1
- if {$n==0} {
- set n 9
+ incr n
+ if {$n==10} {
+ set n 1
}
- $w.top.a.logo configure -bitmap @book$n
+ $w.top.a.logo configure -bitmap @${libdir}/bitmaps/book$n
after 140 [list about-origin-logo $n]
}
proc about-origin {} {
set w .about-origin-w
+ global libdir
+ global tk_version
if {[winfo exists $w]} {
destroy $w
label $w.top.a.irtcl -text "IrTcl" \
-font -Adobe-Helvetica-Bold-R-Normal-*-240-*
- label $w.top.a.logo -bitmap @book1
+ label $w.top.a.logo -bitmap @${libdir}/bitmaps/book1
pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
- set i [z39 implementationName]
+ set i unknown
+ catch {set i [z39 implementationName]}
label $w.top.p.in -text "Implementation name: $i"
- set i [z39 implementationId]
+ catch {set i [z39 implementationId]}
label $w.top.p.ii -text "Implementation id: $i"
- set i [z39 implementationVersion]
+ catch {set i [z39 implementationVersion]}
label $w.top.p.iv -text "Implementation version: $i"
+ set i $tk_version
+ label $w.top.p.tk -text "Tk version: $i"
- pack $w.top.p.in $w.top.p.ii $w.top.p.iv -side top -anchor nw
+ pack $w.top.p.in $w.top.p.ii $w.top.p.iv $w.top.p.tk -side top -anchor nw
about-origin-logo 1
bottom-buttons $w [list {Close} [list destroy $w] \
}
proc popup-marc {sno no b df} {
- global fullMarcSeq
global displayFormats
global popupMarcdf
if {[z39.$sno type $no] != "DB"} {
return
}
- if {$b} {
- set w .full-marc-$fullMarcSeq
- incr fullMarcSeq
- set df $popupMarcdf
- } else {
- set w .full-marc
- set df $popupMarcdf
+ if {$b == -1} {
+ set b 0
+ while {[winfo exists .full-marc$b]} {
+ incr b
+ }
}
- if {[winfo exists $w]} {
- set new 0
- } else {
-
+ set df $popupMarcdf
+ set w .full-marc$b
+ if {![winfo exists $w]} {
toplevelG $w
wm minsize $w 0 0
-yscrollcommand [list $w.top.s set]
scrollbar $w.top.s -command [list $w.top.record yview]
- if {[tk colormodel .] == "color"} {
+ global monoFlag
+ if {! $monoFlag} {
$w.top.record tag configure marc-tag -foreground blue
$w.top.record tag configure marc-id -foreground red
} else {
$w.top.record tag configure marc-id -foreground black
}
$w.top.record tag configure marc-data -foreground black
- set new 1
+ $w.top.record tag configure marc-head \
+ -font -Adobe-Times-Medium-R-Normal-*-180-* \
+ -background black -foreground white
+
+ $w.top.record tag configure marc-pref \
+ -font -Adobe-Times-Medium-R-Normal-*-180-* \
+ -foreground blue
+ $w.top.record tag configure marc-text \
+ -font -Adobe-Times-Medium-R-Normal-*-180-* \
+ -foreground black
+ $w.top.record tag configure marc-it \
+ -font -Adobe-Times-Medium-I-Normal-*-180-* \
+ -foreground black
+
+ pack $w.top.s -side right -fill y
+ pack $w.top.record -expand yes -fill both
+
+ bottom-buttons $w [list \
+ {Close} [list destroy $w] \
+ {Prev} {} \
+ {Next} {} \
+ {Duplicate} {}] 0
+ menubutton $w.bot.formats -text "Format" -menu $w.bot.formats.m \
+ -relief raised
+ menu $w.bot.formats.m
+ pack $w.bot.formats -expand yes -ipadx 2 -ipady 2 \
+ -padx 3 -pady 3 -side left
+ } else {
+ $w.bot.formats.m delete 0 last
+ }
+ set i 0
+ foreach f $displayFormats {
+ $w.bot.formats.m add radiobutton -label $f \
+ -variable popupMarcdf -value $i \
+ -command [list popup-marc $sno $no $b 0]
+ incr i
}
$w.top.record delete 0.0 end
set recordType [z39.$sno recordType $no]
wm title $w "$recordType record #$no"
+ $w.bot.2 configure -command \
+ [list popup-marc $sno [expr $no-1] $b $df]
+ $w.bot.4 configure -command \
+ [list popup-marc $sno [expr $no+1] $b $df]
+ if {$no == 1} {
+ $w.bot.2 configure -state disabled
+ } else {
+ $w.bot.2 configure -state normal
+ }
+ if {[z39.$sno type [expr $no+1]] != "DB"} {
+ $w.bot.4 configure -state disabled
+ } else {
+ $w.bot.4 configure -state normal
+ }
+ $w.bot.6 configure -command [list popup-marc $sno $no -1 0]
set ffunc [lindex $displayFormats $df]
set ffunc "display-$ffunc"
$ffunc $sno $no $w.top.record 0
+}
- if {$new} {
- bind $w.top.record <Return> {destroy .full-marc}
-
- pack $w.top.s -side right -fill y
- pack $w.top.record -expand yes -fill both
-
- if {$b} {
- bottom-buttons $w [list \
- {Close} [list destroy $w]] 0
- } else {
- bottom-buttons $w [list \
- {Close} [list destroy $w] \
- {Duplicate} [list popup-marc $sno $no 1 0]] 0
- menubutton $w.bot.formats -text "Format" -menu $w.bot.formats.m
- menu $w.bot.formats.m
- set i 0
- foreach f $displayFormats {
- $w.bot.formats.m add radiobutton -label $f \
- -variable popupMarcdf -value $i \
- -command [list display-$f $sno $no $w.top.record 0]
- incr i
- }
- pack $w.bot.formats -expand yes -ipadx 2 -ipady 2 \
- -padx 3 -pady 3 -side left
- }
- } else {
- set i 0
- foreach f $displayFormats {
- $w.bot.formats.m entryconfigure $i \
- -command [list display-$f $sno $no $w.top.record 0]
- incr i
+proc update-target-hotlist {target base} {
+ global hotTargets
+
+ set olen [llength $hotTargets]
+ set i 0
+ foreach e $hotTargets {
+ if {$target == [lindex $e 0] && $base == [lindex $e 1]} {
+ set hotTargets [lreplace $hotTargets $i $i]
+ break
}
+ incr i
}
-}
+ set hotTargets [linsert $hotTargets 0 [list $target $base]]
+ set-target-hotlist $olen
+}
-proc update-target-hotlist {target} {
+proc delete-target-hotlist {target} {
global hotTargets
- set len [llength $hotTargets]
- if {$len > 0} {
- .top.target.m delete 6 [expr 6+[llength $hotTargets]]
- }
- set indx [lsearch $hotTargets $target]
- if {$indx >= 0} {
- set hotTargets [lreplace $hotTargets $indx $indx]
+ set olen [llength $hotTargets]
+ set i 0
+ foreach e $hotTargets {
+ if {$target == [lindex $e 0]} {
+ set hotTargets [lreplace $hotTargets $i $i]
+ }
+ incr i
}
- set hotTargets [linsert $hotTargets 0 $target]
- set-target-hotlist
-}
+ set-target-hotlist $olen
+}
-proc set-target-hotlist {} {
+proc set-target-hotlist {olen} {
global hotTargets
-
+
+ if {$olen > 0} {
+ if {[tk4]} {
+ .top.target.m delete 7 [expr 7+$olen]
+ } else {
+ .top.target.m delete 6 [expr 6+$olen]
+ }
+ }
set i 1
- foreach target $hotTargets {
- .top.target.m add command -label "$i $target" -command \
+ foreach e $hotTargets {
+ set target [lindex $e 0]
+ set base [lindex $e 1]
+ if {$base == ""} {
+ .top.target.m add command -label "$i $target" -command \
[list reopen-target $target {}]
+ } else {
+ .top.target.m add command -label "$i $target - $base" -command \
+ [list reopen-target $target $base]
+ }
incr i
if {$i > 8} {
break
proc reopen-target {target base} {
close-target
open-target $target $base
- update-target-hotlist $target
+ update-target-hotlist $target $base
}
proc define-target-action {} {
if {$target == ""} {
return
}
- update-target-hotlist $target
foreach n [array names profile] {
if {$n == $target} {
protocol-setup $n
}
}
set seq [lindex $profile(Default) 12]
- puts "seq=${seq}"
+ dputs "seq=${seq}"
set profile($target) $profile(Default)
set profile(Default) [lreplace $profile(Default) 12 12 [incr seq]]
}
proc fail-response {target} {
+ set c [lindex [z39 failInfo] 0]
+ set m [lindex [z39 failInfo] 1]
close-target
- tkerror "Target connection closed or protocol error"
+ tkerror "$m ($c)"
}
-proc connect-response {target} {
- puts "connect-response"
- show-target $target
+proc connect-response {target base} {
+ dputs "connect-response"
+ show-target $target $base
init-request
}
z39 disconnect
z39 comstack [lindex $profile($target) 6]
+ z39 protocol [lindex $profile($target) 11]
z39 idAuthentication [lindex $profile($target) 3]
z39 maximumRecordSize [lindex $profile($target) 4]
z39 preferredMessageSize [lindex $profile($target) 5]
- puts -nonewline "maximumRecordSize="
- puts [z39 maximumRecordSize]
- puts -nonewline "preferredMessageSize="
- puts [z39 preferredMessageSize]
- show-status {Connecting} 0 0
+ dputs "maximumRecordSize="
+ dputs [z39 maximumRecordSize]
+ dputs "preferredMessageSize="
+ dputs [z39 preferredMessageSize]
+ show-status Connecting 1 0
if {$base == ""} {
z39 databaseNames [lindex [lindex $profile($target) 7] 0]
} else {
z39 databaseNames $base
}
z39 failback [list fail-response $target]
- z39 callback [list connect-response $target]
- z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
-# z39 options search present scan namedResultSets triggerResourceCtrl
- show-status {Connecting} 1 {}
+ z39 callback [list connect-response $target $base]
+ update idletasks
+ set err [catch {
+ z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
+ } errorMessage]
+ if {$err} {
+ tkerror $errorMessage
+ show-status "Not connected" 0 {}
+ return
+ }
set hostid $target
- .top.target.m disable 0
- .top.target.m enable 1
- .top.target.m enable 2
+ configure-disable-e .top.target.m 0
+ configure-enable-e .top.target.m 1
+ configure-enable-e .top.target.m 2
}
proc close-target {} {
global hostid
global cancelFlag
global setNo
+ global setNoLast
set cancelFlag 0
set setNo 0
+ set setNoLast 0
.bot.a.set configure -text ""
set hostid Default
z39 disconnect
- show-target {}
+ show-target {} {}
show-status {Not connected} 0 0
init-title-lines
show-message {}
- .top.target.m disable 1
- .top.target.m disable 2
- .top.target.m enable 0
+ configure-disable-e .top.target.m 1
+ configure-disable-e .top.target.m 2
+ if {[tk4]} {
+ .top.rset.m delete 2 last
+ } else {
+ .top.rset.m delete 1 last
+ }
+ .top.rset.m add separator
+ configure-enable-e .top.target.m 0
}
proc load-set-action {} {
- global setNo
+ global setNoLast
- incr setNo
- ir-set z39.$setNo z39
+ incr setNoLast
+ ir-set z39.$setNoLast z39
set fname [.load-set.top.filename.entry get]
destroy .load-set
if {$fname != ""} {
- show-status {Loading} 1 {}
+ show-status Loading 1 {}
update
- z39.$setNo loadFile $fname
+ z39.$setNoLast loadFile $fname
- set no [z39.$setNo numberOfRecordsReturned]
- add-title-lines $setNo $no 1
+ set no [z39.$setNoLast numberOfRecordsReturned]
+ add-title-lines $setNoLast $no 1
}
- set l [format "%-4d %7d" $setNo $no]
+ set l [format "%-4d %7d" $setNoLast $no]
.top.rset.m add command -label $l \
- -command [list add-title-lines $setNo 10000 1]
- show-status {Ready} 0 {}
+ -command [list add-title-lines $setNoLast 10000 1]
+ show-status Ready 0 {}
}
proc load-set {} {
set w .load-set
-
- set oldFocus [focus]
toplevel $w
-
+ set oldFocus [focus]
place-force $w .
top-down-window $w
}
proc init-request {} {
- global setNo
global cancelFlag
if {$cancelFlag} {
return
}
z39 callback {init-response}
- show-status {Initializing} 1 {}
- z39 init
+ show-status Initializing 1 {}
+ set err [catch {z39 init} errorMessage]
+ if {$err} {
+ tkerror $errorMessage
+ show-status Ready 0 {}
+ }
}
proc init-response {} {
global cancelFlag
global scanEnable
+ dputs {init-reponse}
if {$cancelFlag} {
close-target
return
}
if {![z39 initResult]} {
- show-status {Ready} 0 1
+ show-status Ready 0 1
set u [z39 userInformationField]
close-target
tkerror "Connection rejected by target: $u"
} else {
set scanEnable 0
}
- show-status {Ready} 0 1
+ show-status Ready 0 1
}
}
-proc search-request {} {
+proc search-request {bflag} {
global setNo
+ global setNoLast
global profile
global hostid
global busy
global cancelFlag
- global searchEnable
+ global delayRequest
+ global recordSyntax
+ global elementSetNames
set target $hostid
- if {$searchEnable == 0} {
+ if {[z39 connect] == ""} {
+ return
+ }
+ dputs "search-request"
+ show-message {}
+ if {!$bflag && $busy} {
+ dputs "busy: search-request ignored"
return
}
+ if {$cancelFlag} {
+ dputs "cancelFlag"
+ show-status Searching 1 0
+ set delayRequest {search-request 1}
+ return
+ }
+ set delayRequest {}
+
set query [index-query]
if {$query==""} {
return
}
- incr setNo
+ incr setNoLast
+ set setNo $setNoLast
ir-set z39.$setNo z39
- z39.$setNo preferredRecordSyntax SUTRS
if {[lindex $profile($target) 10] == 1} {
z39.$setNo setName $setNo
- puts "setName=${setNo}"
+ dputs "setName=${setNo}"
} else {
z39.$setNo setName Default
- puts "setName=Default"
+ dputs "setName=Default"
}
if {[lindex $profile($target) 8] == 1} {
z39.$setNo queryType rpn
if {[lindex $profile($target) 9] == 1} {
z39.$setNo queryType ccl
}
+ dputs Setting
+ dputs $recordSyntax
+ if {$recordSyntax == "None" } {
+ z39.$setNo preferredRecordSyntax {}
+ } else {
+ z39.$setNo preferredRecordSyntax $recordSyntax
+ }
+ if {$elementSetNames == "None" } {
+ z39.$setNo elementSetNames {}
+ } else {
+ z39.$setNo elementSetNames $elementSetNames
+ }
z39 callback {search-response}
z39.$setNo search $query
- show-status {Searching} 1 0
+ show-status Searching 1 0
}
proc scan-copy {y entry} {
set w .scan-window
set no [$w.top.list nearest $y]
- puts "no=$no"
+ dputs "no=$no"
.lines.$entry.e delete 0 end
.lines.$entry.e insert 0 [string range [$w.top.list get $no] 8 end]
}
global curIndexEntry
global queryButtonsFind
global queryInfoFind
+ global cancelFlag
+ global delayRequest
+
+ dputs "scan-request"
+ if {$cancelFlag} {
+ dputs "cancelFlag"
+ show-status Scanning 1 0
+ set delayRequest scan-request
+ return
+ }
+ set delayRequest {}
set target $hostid
set scanView 0
entry $w.top.entry -relief sunken
pack $w.top.entry -fill x -padx 4 -pady 2
bind $w.top.entry <KeyRelease> [list scan-term-h $attr]
- if {1} {
- listbox $w.top.list -yscrollcommand [list $w.top.scroll set] \
- -font fixed
- scrollbar $w.top.scroll -orient vertical -border 1
- pack $w.top.list -side left -fill both -expand yes
- pack $w.top.scroll -side right -fill y
- $w.top.scroll config -command [list $w.top.list yview]
- } else {
- listbox $w.top.list -font fixed -geometry 60x14
- pack $w.top.list -side left -fill both -expand yes
- }
+ listbox $w.top.list -yscrollcommand [list $w.top.scroll set] \
+ -font fixed
+ scrollbar $w.top.scroll -orient vertical -border 1
+ pack $w.top.list -side left -fill both -expand yes
+ pack $w.top.scroll -side right -fill y
+ $w.top.scroll config -command [list $w.top.list yview]
bottom-buttons $w [list {Close} [list destroy $w] \
{Up} [list scan-up $attr] \
{Down} [list scan-down $attr]] 0
bind $w.top.list <Up> [list scan-up $attr]
bind $w.top.list <Down> [list scan-down $attr]
+ focus $w.top.entry
}
bind $w.top.list <Double-Button-1> [list scan-copy %y $curIndexEntry]
wm title $w "Scan $title"
z39.scan preferredPositionInResponse 1
z39.scan scan "${attr} 0"
- show-status {Scanning} 1 0
+ show-status Scanning 1 0
}
proc scan-term-h {attr} {
z39 callback [list scan-response $attr 0 35]
z39.scan numberOfTermsRequested 5
z39.scan preferredPositionInResponse 1
- puts "${attr} \{${scanTerm}\}"
+ dputs "${attr} \{${scanTerm}\}"
if {$scanTerm == ""} {
z39.scan scan "${attr} 0"
} else {
z39.scan scan "${attr} \{${scanTerm}\}"
}
- show-status {Scanning} 1 0
+ show-status Scanning 1 0
}
proc scan-response {attr start toget} {
global cancelFlag
+ global delayRequest
global scanTerm
global scanView
set w .scan-window
- puts "In scan-response"
+ dputs "In scan-response"
set m [z39.scan numberOfEntriesReturned]
- puts $m
- puts attr=$attr
- puts start=$start
- puts toget=$toget
+ dputs $m
+ dputs attr=$attr
+ dputs start=$start
+ dputs toget=$toget
if {![winfo exists .scan-window]} {
- show-status {Ready} 0 1
- set cancelFlag 0
+ if {$cancelFlag} {
+ set cancelFlag 0
+ dputs "Handling cancel"
+ if {$delayRequest != ""} {
+ eval $delayRequest
+ }
+ return
+ }
+ show-status Ready 0 1
return
}
set nScanTerm [$w.top.entry get]
z39.scan numberOfTermsRequested 5
z39.scan preferredPositionInResponse 1
set scanTerm $nScanTerm
- puts "${attr} \{${scanTerm}\}"
+ dputs "${attr} \{${scanTerm}\}"
if {$scanTerm == ""} {
z39.scan scan "${attr} 0"
} else {
z39.scan scan "${attr} \{${scanTerm}\}"
}
- show-status {Scanning} 1 0
+ show-status Scanning 1 0
return
}
set status [z39.scan scanStatus]
if {$status == 6} {
tkerror "Scan fail"
- show-status {Ready} 0 1
+ show-status Ready 0 1
set cancelFlag 0
return
}
}
}
if {$cancelFlag} {
- show-status {Ready} 0 1
+ dputs "Handling cancel"
set cancelFlag 0
+ if {$delayRequest != ""} {
+ eval $delayRequest
+ }
return
}
+ set delayRequest {}
if {$toget > 0 && $m > 1 && $m < $toget} {
set ntoget [expr $toget - $m + 1]
- puts ntoget=$ntoget
+ dputs ntoget=$ntoget
z39 callback [list scan-response $attr [expr $start + $m - 1] $ntoget]
set q $term
- puts "down continue: $q"
+ dputs "down continue: $q"
if {$ntoget > 10} {
z39.scan numberOfTermsRequested 10
} else {
z39.scan numberOfTermsRequested $ntoget
}
z39.scan preferredPositionInResponse 1
- puts "${attr} \{$q\}"
+ dputs "${attr} \{$q\}"
z39.scan scan "${attr} \{$q\}"
return
}
if {$toget < 0 && $m > 1 && $m < [expr - $toget]} {
set ntoget [expr - $toget - $m]
- puts ntoget=$ntoget
+ dputs ntoget=$ntoget
z39 callback [list scan-response $attr 0 -$ntoget]
set q [string range [$w.top.list get 0] 8 end]
- puts "up continue: $q"
+ dputs "up continue: $q"
if {$ntoget > 10} {
z39.scan numberOfTermsRequested 10
z39.scan preferredPositionInResponse 11
z39.scan numberOfTermsRequested $ntoget
z39.scan preferredPositionInResponse [incr ntoget]
}
- puts "${attr} \{$q\}"
+ dputs "${attr} \{$q\}"
z39.scan scan "${attr} \{$q\}"
return
}
- show-status {Ready} 0 1
+ show-status Ready 0 1
}
proc scan-down {attr} {
global scanView
+ global cancelFlag
+ global delayRequest
+
+ dputs {scan-down}
+ if {$cancelFlag} {
+ dputs "cancelFlag"
+ show-status {Scanning down} 1 0
+ set delayRequest [list scan-down $attr]
+ return
+ }
+ set delayRequest {}
set w .scan-window
set scanView [expr $scanView + 5]
if {$scanView > $s} {
z39 callback [list scan-response $attr [expr $s - 1] 25]
set q [string range [$w.top.list get [expr $s - 1]] 8 end]
- puts "down: $q"
+ dputs "down: $q"
z39.scan numberOfTermsRequested 10
z39.scan preferredPositionInResponse 1
- show-status {Scanning} 1 0
- puts "${attr} \{$q\}"
+ show-status Scanning 1 0
+ dputs "${attr} \{$q\}"
z39.scan scan "${attr} \{$q\}"
return
}
proc scan-up {attr} {
global scanView
+ global cancelFlag
+ global delayRequest
+
+ dputs {scan-up}
+ if {$cancelFlag} {
+ dputs "cancelFlag"
+ show-status Scanning 1 0
+ set delayRequest [list scan-up $attr]
+ return
+ }
+ set delayRequest {}
set w .scan-window
set scanView [expr $scanView - 5]
if {$scanView < 0} {
z39 callback [list scan-response $attr 0 -25]
set q [string range [$w.top.list get 0] 8 end]
- puts "up: $q"
+ dputs "up: $q"
z39.scan numberOfTermsRequested 10
z39.scan preferredPositionInResponse 11
- show-status {Scanning} 1 0
+ show-status Scanning 1 0
z39.scan scan "${attr} \{$q\}"
return
}
global setMax
global cancelFlag
global busy
+ global delayRequest
- puts "In search-response"
+ dputs "In search-response"
+ if {$cancelFlag} {
+ dputs "Handling cancel"
+ set cancelFlag 0
+ if {$delayRequest != ""} {
+ eval $delayRequest
+ }
+ return
+ }
+ set setOffset 0
+ set delayRequest {}
init-title-lines
set setMax [z39.$setNo resultCount]
+ show-status Ready 0 1
+ set status [z39.$setNo responseStatus]
+ if {[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"
+ return
+ }
show-message "${setMax} hits"
+ if {$setMax == 0} {
+ return
+ }
+ set setOffset 1
+ 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]
- if {$setMax <= 0} {
- show-status {Ready} 0 1
- set status [z39.$setNo responseStatus]
- if {[lindex $status 0] == "NSD"} {
- set code [lindex $status 1]
- set msg [lindex $status 2]
- set addinfo [lindex $status 3]
- tkerror "NSD$code: $msg: $addinfo"
- }
- return
- }
if {$setMax > 20} {
set setMax 20
}
- set setOffset 1
- show-status {Ready} 0 1
- if {$cancelFlag} {
- set cancelFlag 0
- return
- }
z39 callback {present-response}
z39.$setNo present $setOffset 1
- show-status {Retrieving} 1 0
+ show-status Retrieving 1 0
}
proc present-more {number} {
global setNo
global setOffset
global setMax
+ global busy
+ global cancelFlag
+ global delayRequest
+
+ dputs "present-more"
+ if {$cancelFlag} {
+ show-status Retrieving 1 0
+ set delayRequest "present-more $number"
+ return
+ }
+ set delayRequest {}
- puts "setOffset=$setOffset"
- puts "present-more"
if {$setNo == 0} {
- puts "setNo=$setNo"
+ dputs "setNo=$setNo"
return
}
+ set setOffset [z39.$setNo nextResultSetPosition]
+ dputs "setOffest=${setOffset}"
+ dputs "setNo=${setNo}"
set max [z39.$setNo resultCount]
- if {$max <= $setOffset} {
- puts "max=$max"
- puts "setOffset=$setOffset"
+ if {$max < $setOffset} {
+ dputs "max=$max"
+ dputs "setOffset=$setOffset"
+ show-status Ready 0 1
return
}
if {$number == ""} {
set toGet 3
}
z39.$setNo present $setOffset $toGet
- show-status {Retrieving} 1 0
+ show-status Retrieving 1 0
}
proc init-title-lines {} {
.data.record delete 0.0 end
}
-proc title-press {y setno} {
- show-full-marc $setno [expr 1 + [.data.list nearest $y]] 0
-}
-
proc add-title-lines {setno no offset} {
global displayFormats
global displayFormat
- global lastSetNo
+ global setNo
+ global busy
- if {$setno == 0} {
- set setno $lastSetNo
+ if {$setno != -1} {
+ set setNo $setno
} else {
- set lastSetNo $setno
+ set setno $setNo
}
if {$offset == 1} {
.bot.a.set configure -text $setno
.data.record delete 0.0 end
}
set ffunc [lindex $displayFormats $displayFormat]
+ dputs "ffunc=$ffunc"
set ffunc "display-$ffunc"
for {set i 0} {$i < $no} {incr i} {
set o [expr $i + $offset]
[list popup-marc $setno $o 0 0]
update idletasks
}
+ if {!$busy} {
+ show-status Ready 0 1
+ }
}
proc present-response {} {
global setOffset
global setMax
global cancelFlag
+ global delayRequest
- puts "In present-response"
+ dputs "In present-response"
set no [z39.$setNo numberOfRecordsReturned]
- puts "Returned $no records, setOffset $setOffset"
+ dputs "Returned $no records, setOffset $setOffset"
add-title-lines $setNo $no $setOffset
set setOffset [expr $setOffset + $no]
+ if {$cancelFlag} {
+ dputs "Handling cancel"
+ set cancelFlag 0
+ if {$delayRequest != ""} {
+ eval $delayRequest
+ }
+ return
+ }
set status [z39.$setNo responseStatus]
if {[lindex $status 0] == "NSD"} {
- show-status {Ready} 0 1
+ show-status Ready 0 1
set code [lindex $status 1]
set msg [lindex $status 2]
set addinfo [lindex $status 3]
tkerror "NSD$code: $msg: $addinfo"
return
}
- if {$cancelFlag} {
- show-status {Ready} 0 1
- set cancelFlag 0
- return
- }
if {$no > 0 && $setOffset <= $setMax} {
- puts "present-request from ${setOffset}"
+ dputs "present-request from ${setOffset}"
set toGet [expr $setMax - $setOffset + 1]
if {$toGet > 3} {
set toGet 3
}
z39.$setNo present $setOffset $toGet
} else {
- show-status {Ready} 0 1
+ show-status Ready 0 1
}
}
incr i -1
$w icursor $i
}
+ dputs left
}
proc right-cursor {w} {
set i [$w index insert]
incr i
+ dputs right
$w icursor $i
}
for {set i 0} {$i < $max} {incr i} {
bind [lindex $list $i] <Return> $returnAction
bind [lindex $list $i] <Escape> $escapeAction
- bind [lindex $list $i] <Tab> [list focus [lindex $list [expr $i+1]]]
- bind [lindex $list $i] <Left> [list left-cursor [lindex $list $i]]
- bind [lindex $list $i] <Right> [list right-cursor [lindex $list $i]]
+ if {![tk4]} {
+ bind [lindex $list $i] <Tab> \
+ [list focus [lindex $list [expr $i+1]]]
+ bind [lindex $list $i] <Left> \
+ [list left-cursor [lindex $list $i]]
+ bind [lindex $list $i] <Right> \
+ [list right-cursor [lindex $list $i]]
+ }
}
bind [lindex $list $i] <Return> $returnAction
bind [lindex $list $i] <Escape> $escapeAction
- bind [lindex $list $i] <Tab> [list focus [lindex $list 0]]
- bind [lindex $list $i] <Left> [list left-cursor [lindex $list $i]]
- bind [lindex $list $i] <Right> [list right-cursor [lindex $list $i]]
+ if {![tk4]} {
+ bind [lindex $list $i] <Tab> [list focus [lindex $list 0]]
+ bind [lindex $list $i] <Left> [list left-cursor [lindex $list $i]]
+ bind [lindex $list $i] <Right> [list right-cursor [lindex $list $i]]
+ }
focus [lindex $list 0]
}
top-down-ok-cancel $w {define-target-action} 1
}
-proc protocol-setup-delete {target} {
+proc protocol-setup-delete {target w} {
global profile
+ global settingsChanged
set a [alert "Are you sure you want to delete the target \
definition $target ?"]
if {$a} {
- set wno [lindex $profile($target) 12]
- set w .setup-${wno}
destroy $w
unset profile($target)
+ set settingsChanged 1
cascade-target-list
+ delete-target-hotlist $target
}
}
-proc protocol-setup-action {target} {
+proc protocol-setup-action {target w} {
global profile
global csRadioType
global protocolRadioType
global CCLCheck
global ResultSetCheck
- set wno [lindex $profile($target) 12]
- set w .setup-${wno}
-
set b {}
set settingsChanged 1
set len [$w.top.databases.list size]
$wno]
cascade-target-list
- puts $profile($target)
+ delete-target-hotlist $target
+ dputs $profile($target)
destroy $w
}
wm geometry $window +${x}+${y}
}
-proc add-database-action {target} {
+proc add-database-action {target w} {
global profile
- set wno [lindex $profile($target) 12]
- set w .setup-${wno}
-
$w.top.databases.list insert end \
[.database-select.top.database.entry get]
destroy .database-select
}
-proc add-database {target} {
+proc add-database {target wp} {
global profile
set w .database-select
-
- set oldFocus [focus]
toplevel $w
+ set oldFocus [focus]
- set wno [lindex $profile($target) 12]
- place-force $w .setup-${wno}
+ place-force $w $wp
top-down-window $w
entry-fields $w.top {database} \
{{Database to add:}} \
- [list add-database-action $target] {destroy .database-select}
+ [list add-database-action $target $wp] {destroy .database-select}
- top-down-ok-cancel $w [list add-database-action $target] 1
+ top-down-ok-cancel $w [list add-database-action $target $wp] 1
focus $oldFocus
}
-proc delete-database {target} {
+proc delete-database {target w} {
global profile
- set wno [lindex $profile($target) 12]
- set w .setup-${wno}
set l {}
foreach i [$w.top.databases.list curselection] {
set b [$w.top.databases.list get $i]
global RPNCheck
global CCLCheck
global ResultSetCheck
-
- set wno [lindex $profile($target) 12]
- set w .setup-${wno}
+
+ set b 0
+ while {[winfo exists .setup-$b]} {
+ incr b
+ }
+ set w .setup-$b
toplevelG $w
if {$target == ""} {
set target Default
}
- puts target
- puts $profile($target)
+ dputs target
+ dputs $profile($target)
+ frame $w.top.description
frame $w.top.host
frame $w.top.port
- frame $w.top.description
frame $w.top.idAuthentication
frame $w.top.maximumRecordSize
frame $w.top.preferredMessageSize
maximumRecordSize preferredMessageSize} \
{{Description:} {Host:} {Port:} {Id Authentication:} \
{Maximum Record Size:} {Preferred Message Size:}} \
- [list protocol-setup-action $target] [list destroy $w]
+ [list protocol-setup-action $target $w] [list destroy $w]
foreach sub {description host port idAuthentication \
maximumRecordSize preferredMessageSize} {
- puts $sub
- bind $w.top.$sub.entry <Control-a> [list add-database $target]
- bind $w.top.$sub.entry <Control-d> [list delete-database $target]
+ dputs $sub
+ bind $w.top.$sub.entry <Control-a> [list add-database $target $w]
+ bind $w.top.$sub.entry <Control-d> [list delete-database $target $w]
}
$w.top.description.entry insert 0 [lindex $profile($target) 0]
$w.top.host.entry insert 0 [lindex $profile($target) 1]
set ResultSetCheck [lindex $profile($target) 10]
set protocolRadioType [lindex $profile($target) 11]
if {$protocolRadioType == ""} {
- set protocolRadioType z39v2
+ set protocolRadioType Z39
}
# Databases ....
- pack $w.top.databases -side left -pady 4 -padx 4 -expand yes -fill both
+ pack $w.top.databases -side left -pady 2 -padx 2 -expand yes -fill both
label $w.top.databases.label -text "Databases"
- button $w.top.databases.add -text "Add" \
- -command [list add-database $target]
- button $w.top.databases.delete -text "Delete" \
- -command [list delete-database $target]
- listbox $w.top.databases.list -geometry 20x6 \
- -yscrollcommand "$w.top.databases.scroll set"
+ button $w.top.databases.add -text Add \
+ -command [list add-database $target $w]
+ button $w.top.databases.delete -text Delete \
+ -command [list delete-database $target $w]
+ if {! [tk4]} {
+ listbox $w.top.databases.list -geometry 14x6 \
+ -yscrollcommand "$w.top.databases.scroll set"
+ } else {
+ listbox $w.top.databases.list -width 14 -height 5\
+ -yscrollcommand "$w.top.databases.scroll set"
+ }
scrollbar $w.top.databases.scroll -orient vertical -border 1
pack $w.top.databases.label -side top -fill x \
-padx 2 -pady 2
}
# Transport ...
- pack $w.top.cs-type -pady 4 -padx 4 -side top -fill x
+ pack $w.top.cs-type -pady 2 -padx 2 -side top -fill x
label $w.top.cs-type.label -text "Transport"
radiobutton $w.top.cs-type.tcpip -text "TCP/IP" -anchor w \
- -command {puts tcp/ip} -variable csRadioType -value tcpip
+ -variable csRadioType -value tcpip
radiobutton $w.top.cs-type.mosi -text "MOSI" -anchor w\
- -command {puts mosi} -variable csRadioType -value mosi
+ -variable csRadioType -value mosi
pack $w.top.cs-type.label $w.top.cs-type.tcpip $w.top.cs-type.mosi \
- -padx 4 -side top -fill x
+ -padx 2 -side top -fill x
# Protocol ...
- pack $w.top.protocol -pady 4 -padx 4 -side top -fill x
+ pack $w.top.protocol -pady 2 -padx 2 -side top -fill x
label $w.top.protocol.label -text "Protocol"
radiobutton $w.top.protocol.z39v2 -text "Z39.50" -anchor w \
- -command {puts z39v2} -variable protocolRadioType -value z39v2
+ -variable protocolRadioType -value Z39
radiobutton $w.top.protocol.sr -text "SR" -anchor w \
- -command {puts sr} -variable protocolRadioType -value sr
+ -variable protocolRadioType -value SR
pack $w.top.protocol.label $w.top.protocol.z39v2 $w.top.protocol.sr \
- -padx 4 -side top -fill x
+ -padx 2 -side top -fill x
# Query ...
- pack $w.top.query -pady 4 -padx 4 -side top -fill x
+ pack $w.top.query -pady 2 -padx 2 -side top -fill x
label $w.top.query.label -text "Query support"
checkbutton $w.top.query.c1 -text "RPN query" -anchor w -variable RPNCheck
pack $w.top.query.label -side top
pack $w.top.query.c1 $w.top.query.c2 $w.top.query.c3 \
- -padx 4 -side top -fill x
+ -padx 2 -side top -fill x
# Ok-cancel
- bottom-buttons $w [list {Ok} [list protocol-setup-action $target] \
- {Delete} [list protocol-setup-delete $target] \
+ bottom-buttons $w [list {Ok} [list protocol-setup-action $target $w] \
+ {Delete} [list protocol-setup-delete $target $w] \
{Cancel} [list destroy $w]] 0
}
global hostid
toplevel $w
-
+ set oldFocus [focus]
place-force $w .
top-down-window $w
pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
label $w.top.databases.label -text "List"
- listbox $w.top.databases.list -geometry 20x6 \
+ listbox $w.top.databases.list -width 20 -height 6 \
-yscrollcommand "$w.top.databases.scroll set"
scrollbar $w.top.databases.scroll -orient vertical -border 1
pack $w.top.databases.label -side top -fill x \
$w.top.databases.list insert end $b
}
top-down-ok-cancel $w {database-select-action} 1
+ focus $oldFocus
}
proc cascade-target-list {} {
destroy $sub
}
.top.target.m.clist delete 0 last
- foreach n [array names profile] {
+ foreach n [lsort [array names profile]] {
if {$n != "Default"} {
set nl [lindex $profile($n) 12]
if {[llength [lindex $profile($n) 7]] > 1} {
}
}
.top.target.m.slist delete 0 last
- foreach n [array names profile] {
+ foreach n [lsort [array names profile]] {
if {$n != "Default"} {
.top.target.m.slist add command -label $n \
-command [list protocol-setup $n]
set w .query-new
toplevel $w
+ set oldFocus [focus]
place-force $w .
top-down-window $w
frame $w.top.index
{{Query Name:}} \
query-new-action {destroy .query-new}
top-down-ok-cancel $w query-new-action 1
+ focus $oldFocus
}
proc query-delete-action {queryNo} {
label $w.top.warning -bitmap warning
message $w.top.quest -text "Are you sure you want to delete the \
-query type $n ?" -aspect 200
+query type $n ?" -aspect 300
pack $w.top.warning $w.top.quest -side left -expand yes -padx 10 -pady 5
bottom-buttons $w [list {Ok} [list query-delete-action $queryNo] \
{Cancel} [list destroy $w]] 1
global textWrap
global displayFormat
global popupMarcdf
-
- set windowGeometry(.) [wm geometry .]
+ global recordSyntax
+ global elementSetNames
- set f [open "clientg.tcl" w]
+ set windowGeometry(.) [wm geometry .]
+ if {[catch {set f [open ~/.clientrc.tcl w]}]} {
+ return
+ }
puts $f "set hotTargets \{ $hotTargets \}"
puts $f "set textWrap $textWrap"
puts $f "set displayFormat $displayFormat"
puts $f "set popupMarcdf $popupMarcdf"
+ puts $f "set recordSyntax $recordSyntax"
+ puts $f "set elementSetNames $elementSetNames"
foreach n [array names windowGeometry] {
puts -nonewline $f "set \{windowGeometry($n)\} \{"
puts -nonewline $f $windowGeometry($n)
proc save-settings {} {
global profile
+ global libdir
global settingsChanged
global queryTypes
global queryButtons
global queryInfo
-
- set f [open "clientrc.tcl" w]
+
+ if {![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} {
+ return
+ }
+ set f [open "clientrc.tcl" w]
+ } else {
+ set f [open "${libdir}/clientrc.tcl" w]
+ }
puts $f "# Setup file"
foreach n [array names profile] {
global alertAnswer
toplevel $w
+ set oldFocus [focus]
place-force $w .
top-down-window $w
label $w.top.warning -bitmap warning
- message $w.top.message -text $ask -aspect 200 \
+ message $w.top.message -text $ask -aspect 300 \
-font -Adobe-Times-Medium-R-Normal-*-180-*
pack $w.top.warning $w.top.message -side left -pady 5 -padx 10 -expand yes
set alertAnswer 0
top-down-ok-cancel $w {alert-action} 1
+ focus $oldFocus
return $alertAnswer
}
global settingsChanged
if {$settingsChanged} {
- set a [alert "you havent saved your settings. Do you wish to save?"]
+ set a [alert "you haven't saved your settings. Do you wish to save?"]
if {$a} {
save-settings
}
set w .query-add-index
toplevel $w
+ set oldFocus [focus]
place-force $w .query-setup
top-down-window $w
frame $w.top.index
{{Index Name:}} \
[list query-add-index-action $queryNo] [list destroy $w]
top-down-ok-cancel $w [list query-add-index-action $queryNo] 1
+ focus $oldFocus
}
proc query-setup-action {queryNo} {
global queryIndexTmp
set queryButtonsTmp [lreplace $queryButtonsTmp $no $no [list I $i]]
- puts $queryButtonsTmp
+ dputs $queryButtonsTmp
set queryIndexTmp $i
}
set queryButtonsFind [lreplace $queryButtonsFind $no $no [list I $i]]
- puts "queryButtonsFind $queryButtonsFind"
+ dputs "queryButtonsFind $queryButtonsFind"
}
proc update-attr {} {
}
incr lno
}
- $w.top.use.list select from $s
- $w.top.use.list select to $s
+ if {[tk4]} {
+ $w.top.use.list selection clear 0 end
+ $w.top.use.list selection set $s $s
+ } else {
+ $w.top.use.list select from $s
+ $w.top.use.list select to $s
+ }
incr s -3
if {$s < 0} {
set s 0
set lno [lindex [$w.top.use.list curselection] 0]
set i [expr $lno+$lno+1]
set useTmpValue [lindex $attr $i]
- puts "useTmpValue=$useTmpValue"
+ dputs "useTmpValue=$useTmpValue"
}
}
use-attr 0
- puts "index-setup-action"
- puts "queryNo $queryNo"
- puts "indexNo $indexNo"
+ dputs "index-setup-action"
+ dputs "queryNo $queryNo"
+ dputs "indexNo $indexNo"
if {$useTmpValue > 0} {
lappend attr "1=$useTmpValue"
}
if {$completenessTmpValue > 0} {
lappend attr "6=$completenessTmpValue"
}
- puts "new attr $attr"
+ dputs "new attr $attr"
set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
destroy .index-setup
}
set completenessTmpValue 0
set useTmpValue 0
+ catch {destroy $w}
+ toplevelG $w
+
+ set n [lindex $attr 0]
+ wm title $w "Index setup $n"
+
+ top-down-window $w
+
set len [llength $attr]
for {set i 1} {$i < $len} {incr i} {
set q [lindex $attr $i]
}
}
}
- if {[winfo exists $w]} {
- destroy $w
- }
- toplevelG $w
-
- set n [lindex $attr 0]
- wm title $w "Index setup $n"
-
- top-down-window $w
frame $w.top.use -relief ridge -border 2
frame $w.top.relation -relief ridge -border 2
pack $w.top.use -side left -pady 6 -padx 6 -fill y
label $w.top.use.label -text "Use"
- listbox $w.top.use.list -geometry 26x10 \
- -yscrollcommand "$w.top.use.scroll set"
+ if {[tk4]} {
+ listbox $w.top.use.list -width 26 \
+ -yscrollcommand "$w.top.use.scroll set"
+ } else {
+ listbox $w.top.use.list -geometry 26x10 \
+ -yscrollcommand "$w.top.use.scroll set"
+ }
scrollbar $w.top.use.scroll -orient vertical -border 1
pack $w.top.use.label -side top -fill x \
-padx 2 -pady 2
return
}
set attr [lindex $queryInfoTmp $i]
- puts "Editing no $i $attr"
+ dputs "Editing no $i $attr"
index-setup $attr $queryNo $i
}
listbox $w.top.index.list -yscrollcommand [list $w.top.index.scroll set]
scrollbar $w.top.index.scroll -orient vertical -border 1 \
-command [list $w.top.index.list yview]
- bind $w.top.index.list <2> [list query-edit-index $queryNo]
+ bind $w.top.index.list <Double-1> [list query-edit-index $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
- $w.top.index.list select from 0
- $w.top.index.list select to 0
+ if {[tk4]} {
+ $w.top.index.list selection clear 0 end
+ $w.top.index.list selection set 0 0
+ } else {
+ $w.top.index.list select from 0
+ $w.top.index.list select to 0
+ }
foreach x $queryInfoTmp {
$w.top.index.list insert end [lindex $x 0]
}
+
# Bottom
bottom-buttons $w [list \
- {Ok} [list query-setup-action $queryNo] \
- {Add index} [list query-add-index $queryNo] \
- {Edit index} [list query-edit-index $queryNo] \
- {Delete index} [list query-delete-index $queryNo] \
- {Cancel} [list destroy $w]] 0
+ Ok [list query-setup-action $queryNo] \
+ Add [list query-add-index $queryNo] \
+ Edit [list query-edit-index $queryNo] \
+ Delete [list query-delete-index $queryNo] \
+ Cancel [list destroy $w]] 0
}
proc index-clear {} {
if {$term != ""} {
set attr [lrange [lindex $queryInfoFind [lindex $b 1]] 1 end]
+ set relation ""
+ set len [string length $term]
+ incr len -1
+
+ if {$len > 1} {
+ if {[string index $term 0] == ">"} {
+ if {[string index $term 1] == "=" } {
+ set term [string trim [string range $term 2 $len]]
+ set relation 4
+ } else {
+ set term [string trim [string range $term 1 $len]]
+ set relation 5
+ }
+ } elseif {[string index $term 0] == "<"} {
+ if {[string index $term 1] == "=" } {
+ set term [string trim [string range $term 2 $len]]
+ set relation 2
+ } elseif {[string index $term 1] == ">"} {
+ set term [string trim [string range $term 2 $len]]
+ set relation 6
+ } else {
+ set term [string trim [string range $term 1 $len]]
+ set relation 1
+ }
+ }
+ }
set len [string length $term]
incr len -1
set left 0
} elseif {$left} {
set term "@attr 5=2 ${term}"
}
+ if {$relation != ""} {
+ set term "@attr 2=${relation} ${term}"
+ }
foreach a $attr {
set term "@attr $a ${term}"
}
}
incr i
}
- puts "qs= $qs"
+ dputs "qs= $qs"
return $qs
}
proc index-focus-in {w i} {
global curIndexEntry
- $w.$i configure -background red
+ if {! [tk4]} {
+ $w.$i configure -background red
+ }
set curIndexEntry $i
}
set i 0
foreach b $buttonInfo {
if {! [winfo exists $w.$i]} {
- frame $w.$i -background white -border 1
+ if {[tk4]} {
+ frame $w.$i -border 0
+ } else {
+ frame $w.$i -background white -border 1
+ }
}
listbuttonx $w.$i.l [lindex $b 1] $queryInfo $handle $i
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
- bind $w.$i.e <Left> [list left-cursor $w.$i.e]
- bind $w.$i.e <Right> [list right-cursor $w.$i.e]
- bind $w.$i.e <Return> search-request
+ if {![tk4]} {
+ bind $w.$i.e <Left> [list left-cursor $w.$i.e]
+ bind $w.$i.e <Right> [list right-cursor $w.$i.e]
+ }
+ bind $w.$i.e <Return> {search-request 0}
}
} else {
pack $w.$i.l -side left
if {! $realOp} {
return
}
- set j 0
- incr i -1
- while {$j < $i} {
- set k [expr $j+1]
- bind $w.$j.e <Tab> "focus $w.$k.e"
- set j $k
+ if {! [tk4]} {
+ set j 0
+ incr i -1
+ while {$j < $i} {
+ set k [expr $j+1]
+ bind $w.$j.e <Tab> "focus $w.$k.e"
+ set j $k
+ }
}
if {$i >= 0} {
- bind $w.$i.e <Tab> "focus $w.0.e"
+ if {! [tk4]} {
+ bind $w.$i.e <Tab> "focus $w.0.e"
+ }
focus $w.0.e
}
}
.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
+set-target-hotlist 0
-.top.target.m disable 1
-.top.target.m disable 2
+configure-disable-e .top.target.m 1
+configure-disable-e .top.target.m 2
menu .top.target.m.clist
menu .top.target.m.slist
-command [list present-more 10]
.top.service.m.present add command -label "All" \
-command [list present-more {}]
-.top.service.m add command -label "Search" -command {search-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
.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
menu .top.options.m.query
.top.options.m.query add cascade -label "Select" \
.top.options.m.wrap add radiobutton -label "None" \
-value none -variable textWrap -command {set-wrap none}
+menu .top.options.m.syntax
+.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" \
+ -value USMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "UNIMARC" \
+ -value UNIMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "UKMARC" \
+ -value UKMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "DANMARC" \
+ -value DANMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "FINMARC" \
+ -value FINMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "NORMARC" \
+ -value NORMARC -variable recordSyntax
+.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" \
+ -value SUTRS -variable recordSyntax
+.top.options.m.syntax add separator
+.top.options.m.syntax add radiobutton -label "GRS1" \
+ -value GRS1 -variable recordSyntax
+
+menu .top.options.m.elements
+.top.options.m.elements add radiobutton -label "Unspecified" \
+ -value None -variable elementSetNames
+.top.options.m.elements add radiobutton -label "Full" \
+ -value F -variable elementSetNames
+.top.options.m.elements add radiobutton -label "Brief" \
+ -value B -variable elementSetNames
+
menubutton .top.help -text "Help" -menu .top.help.m
menu .top.help.m
index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
-button .mid.search -width 7 -text {Search} -command search-request \
+button .mid.search -text Search -command {search-request 0} \
-state disabled
-button .mid.scan -width 7 -text {Scan} \
+button .mid.scan -text Scan \
-command scan-request -state disabled
-button .mid.present -width 7 -text {Present} -command [list present-more 10] \
+button .mid.present -text {Present} -command [list present-more 10] \
-state disabled
-button .mid.clear -width 7 -text {Clear} -command index-clear
+button .mid.clear -text Clear -command index-clear
pack .mid.search .mid.scan .mid.present .mid.clear -side left \
- -fill y -padx 5 -pady 3
+ -fill y -pady 1
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]} {
+ .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
-if {[tk colormodel .] == "color"} {
+if {! $monoFlag} {
.data.record tag configure marc-tag -foreground blue
.data.record tag configure marc-id -foreground red
} else {
.data.record tag configure marc-id -foreground black
}
.data.record tag configure marc-data -foreground black
-
-button .bot.logo -bitmap @book1 -command cancel-operation
+.data.record tag configure marc-head \
+ -font -Adobe-Times-Medium-R-Normal-*-140-* \
+ -foreground brown -relief raised -borderwidth 1
+.data.record tag configure marc-small-head -foreground brown
+.data.record tag configure marc-pref \
+ -font -Adobe-Times-Medium-R-Normal-*-140-* \
+ -foreground blue
+.data.record tag configure marc-text \
+ -font -Adobe-Times-Medium-R-Normal-*-140-* \
+ -foreground black
+.data.record tag configure marc-it \
+ -font -Adobe-Times-Medium-I-Normal-*-140-* \
+ -foreground black
+
+button .bot.logo -bitmap @${libdir}/bitmaps/book1 -command cancel-operation
+if {[tk4]} {
+ .bot.logo configure -takefocus 0
+}
frame .bot.a
pack .bot.a -side left -fill x
-pack .bot.logo -side right -padx 2 -pady 2
+pack .bot.logo -side right -padx 2 -pady 2 -ipadx 1
message .bot.a.target -text "" -aspect 1000 -border 1
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
-
-ir z39
+ -side left -padx 2 -pady 2 -ipadx 1 -ipady 1
+if {[catch {ir z39}]} {
+ set e [info sharedlibextension]
+ puts -nonewline "Loading irtcl$e ..."
+ load irtcl$e irtcl
+ ir z39
+ puts "ok"
+}
+z39 logLevel all
show-logo 1
projects / ir-tcl-moved-to-github.git / blobdiff