# Sebastian Hammer, Adam Dickmeiss
#
# $Log: client.tcl,v $
-# Revision 1.35 1995-06-12 15:17:31 adam
+# 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
+# Implemented preferredRecordSyntax.
+# Minor changes in diagnostic handling.
+# Record list deleted when connection closes.
+#
+# Revision 1.41 1995/06/14 15:07:59 adam
+# Bug fix in cascade-target-list. Uses yaz-version.h.
+#
+# Revision 1.40 1995/06/14 13:37:17 adam
+# Setting recordType implemented.
+# Setting implementationVersion implemented.
+# Settings implementationId / implementationName edited.
+#
+# Revision 1.39 1995/06/14 12:16:22 adam
+# hotTargets, textWrap and displayFormat saved in clientg.tcl.
+#
+# Revision 1.38 1995/06/14 07:22:45 adam
+# Target definitions can be deleted.
+# Listbox used in the query definition dialog.
+#
+# Revision 1.37 1995/06/13 14:37:59 adam
+# Work on query setup.
+# Better about origin/target.
+# Better presentation formats.
+#
+# Revision 1.36 1995/06/13 07:42:14 adam
+# Bindings removed from text widgets.
+#
+# Revision 1.35 1995/06/12 15:17:31 adam
# Text widget used in main window (instead of listbox) to support
# better presentation formats.
#
# 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 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 delayRequest {}
set queryTypes {Simple}
set queryButtons { { {I 0} {I 1} {I 2} } }
-set queryInfo { { {Title {1=4}} {Author {1=1}} \
+set queryInfo { { {Title {1=4 4=1}} {Author {1=1}} \
{Subject {1=21}} {Any {1=1016}} } }
wm minsize . 0 0
+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
+ }
}
}
+proc set-wrap {m} {
+ global textWrap
+
+ set textWrap $m
+ .data.record configure -wrap $m
+}
+
+proc dputs {m} {
+}
+
proc set-display-format {f} {
global displayFormat
global setNo
+ global busy
set displayFormat $f
if {$setNo == 0} {
return
}
- add-title-lines 0 10000 1
+ if {!$busy} {
+ .bot.a.status configure -text "Reformatting"
+ }
+ update idletasks
+ add-title-lines -1 10000 1
}
-proc destroyG {w} {
- global windowGeometry
- set windowGeometry($w) [wm geometry $w]
- destroy $w
+proc initBindings {} {
+ set w Text
+ bind $w <1> {}
+ bind $w <Double-1> {}
+ bind $w <Triple-1> {}
+ bind $w <B1-Motion> {}
+ bind $w <Shift-1> {}
+ bind $w <Shift-B1-Motion> {}
+ bind $w <2> {}
+ bind $w <B2-Motion> {}
+ bind $w <Any-KeyPress> {}
+ bind $w <Return> {}
+ bind $w <BackSpace> {}
+ bind $w <Delete> {}
+ bind $w <Control-h> {}
+ bind $w <Control-d> {}
+ bind $w <Control-v> {}
+
+ set w Listbox
+ bind $w <B1-Motion> {}
+ bind $w <Shift-B1-Motion> {}
+
+ set w Entry
+}
+
+proc post-menu {wbutton wmenu} {
+ $wmenu activate none
+ focus $wmenu
+ $wmenu post [winfo rootx $wbutton] \
+ [expr [winfo rooty $wbutton]+[winfo height $wbutton]]
+
}
+proc destroyGW {w} {
+ global windowGeometry
+ set windowGeometry($w) [wm geometry $w]
+}
proc toplevelG {w} {
global windowGeometry
wm geometry $w $g
}
}
+ bind $w <Destroy> [list destroyGW $w]
}
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 2 -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 Cancelled 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 {$sb} {
.top.service configure -state normal
.mid.search configure -state normal
- .mid.scan configure -state normal
- .mid.present configure -state normal
+ if {$scanEnable} {
+ .mid.scan configure -state normal
+ }
+ 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 {
+ 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
+
+ wm title $w "License"
+
+ wm minsize $w 0 0
+
+ top-down-window $w
+
+ text $w.top.t -width 80 -height 10 -wrap word \
+ -yscrollcommand [list $w.top.s set]
+ scrollbar $w.top.s -command [list $w.top.t yview]
+
+ pack $w.top.s -side right -fill y
+ pack $w.top.t -expand yes -fill both
+
+ 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
+}
+
proc about-target {} {
set w .about-target-w
+ global hostid
- toplevelG $w
+ toplevel $w
wm title $w "About target"
+ place-force $w .
top-down-window $w
+ frame $w.top.a -relief ridge -border 2
+ frame $w.top.p -relief ridge -border 2
+
+ pack $w.top.a $w.top.p -side top -fill x
+
+ label $w.top.a.about -text "About"
+ label $w.top.a.irtcl -text $hostid \
+ -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
+ pack $w.top.a.about $w.top.a.irtcl -side top
+
set i [z39 targetImplementationName]
- label $w.top.in -text "Implementation name: $i"
+ label $w.top.p.in -text "Implementation name: $i"
set i [z39 targetImplementationId]
- label $w.top.ii -text "Implementation id: $i"
+ label $w.top.p.ii -text "Implementation id: $i"
set i [z39 targetImplementationVersion]
- label $w.top.iv -text "Implementation version: $i"
+ label $w.top.p.iv -text "Implementation version: $i"
set i [z39 options]
- label $w.top.op -text "Protocol options: $i"
+ label $w.top.p.op -text "Protocol options: $i"
- pack $w.top.in $w.top.ii $w.top.iv $w.top.op -side top -anchor nw
+ pack $w.top.p.in $w.top.p.ii $w.top.p.iv $w.top.p.op -side top -anchor nw
- bottom-buttons $w [list {Close} [list destroyG $w]] 1
+ bottom-buttons $w [list {Close} [list destroy $w]] 1
}
-proc about-origin {} {
+proc about-origin-logo {n} {
+ global libdir
set w .about-origin-w
+ if {![winfo exists $w]} {
+ return
+ }
+ incr n
+ if {$n==10} {
+ set n 1
+ }
+ $w.top.a.logo configure -bitmap @${libdir}/bitmaps/book$n
+ after 140 [list about-origin-logo $n]
+}
- toplevelG $w
+proc about-origin {} {
+ set w .about-origin-w
+ global libdir
+
+ if {[winfo exists $w]} {
+ destroy $w
+ }
+ toplevel $w
wm title $w "About IrTcl"
place-force $w .
top-down-window $w
- set i [z39 implementationName]
- label $w.top.in -text "Implementation name: $i"
- set i [z39 implementationId]
- label $w.top.ii -text "Implementation id: $i"
+ frame $w.top.a -relief ridge -border 2
+ frame $w.top.p -relief ridge -border 2
+
+ pack $w.top.a $w.top.p -side top -fill x
+
+ label $w.top.a.irtcl -text "IrTcl" \
+ -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
+ label $w.top.a.logo -bitmap @${libdir}/bitmaps/book1
+ pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
- pack $w.top.in $w.top.ii -side top -anchor nw
+ set i unknown
+ catch {set i [z39 implementationName]}
+ label $w.top.p.in -text "Implementation name: $i"
+ catch {set i [z39 implementationId]}
+ label $w.top.p.ii -text "Implementation id: $i"
+ catch {set i [z39 implementationVersion]}
+ label $w.top.p.iv -text "Implementation version: $i"
- bottom-buttons $w [list {Close} [list destroyG $w]] 1
+ pack $w.top.p.in $w.top.p.ii $w.top.p.iv -side top -anchor nw
+
+ about-origin-logo 1
+ bottom-buttons $w [list {Close} [list destroy $w] \
+ {License} [list popup-license]] 0
}
proc popup-marc {sno no b df} {
global fullMarcSeq
global displayFormats
- global popupMarcOdf
+ 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 {[winfo exists $w]} {
set new 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 {
set new 1
}
$w.top.record delete 0.0 end
-
- set ffunc [lindex $displayFormats $df]
- set ffunc "display-$ffunc"
-
- $ffunc $sno $no $w.top.record 0
+ set recordType [z39.$sno recordType $no]
+ wm title $w "$recordType record #$no"
if {$new} {
bind $w.top.record <Return> {destroy .full-marc}
if {$b} {
bottom-buttons $w [list \
- {Close} [list destroy $w] \
- {Duplicate} [list popup-marc $sno $no 1 $df]] 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 \
- -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
+ {Close} [list destroy $w]] 0
} else {
bottom-buttons $w [list \
- {Close} [list destroyG $w] \
- {Duplicate} [list popup-marc $sno $no 1 $df]] 0
+ {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
}
}
} else {
set i 0
+ $w.bot.formats.m delete 0 last
foreach f $displayFormats {
- $w.bot.formats.m entryconfigure $i \
- -command [list display-f $sno $no $w.top.record 0]
+ $w.bot.formats.m add radiobutton -label $f \
+ -variable popupMarcdf -value $i \
+ -command [list display-$f $sno $no $w.top.record 0]
incr i
}
}
+ set ffunc [lindex $displayFormats $df]
+ set ffunc "display-$ffunc"
+
+ $ffunc $sno $no $w.top.record 0
}
-proc update-target-hotlist {target} {
+proc update-target-hotlist {target base} {
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] && $base == [lindex $e 1]} {
+ set hotTargets [lreplace $hotTargets $i $i]
+ break
+ }
+ incr i
}
- set hotTargets [linsert $hotTargets 0 $target]
- set-target-hotlist
+ set hotTargets [linsert $hotTargets 0 [list $target $base]]
+ set-target-hotlist $olen
}
-proc set-target-hotlist {} {
+proc delete-target-hotlist {target} {
global hotTargets
-
+
+ set olen [llength $hotTargets]
+ set i 0
+ foreach e $hotTargets {
+ if {$target == [lindex $e 0]} {
+ set hotTargets [lreplace $hotTargets $i $i]
+ }
+ incr i
+ }
+ set-target-hotlist $olen
+}
+
+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 {}
- z39.$setNo loadFile $fname
+ show-status Loading 1 {}
+ update
+ 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
frame $w.top.filename
-
pack $w.top.filename -side top -anchor e -pady 2
entry-fields $w.top {filename} \
}
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
if {$cancelFlag} {
close-target
return
}
- show-status {Ready} 0 1
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
}
}
-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
set target $hostid
- if {$searchEnable == 0} {
+ 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
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
+ }
z39 callback {search-response}
z39.$setNo search $query
- show-status {Search} 1 0
+ show-status Searching 1 0
}
-proc scan-request {attr} {
+proc scan-copy {y entry} {
+ set w .scan-window
+ set no [$w.top.list nearest $y]
+ dputs "no=$no"
+ .lines.$entry.e delete 0 end
+ .lines.$entry.e insert 0 [string range [$w.top.list get $no] 8 end]
+}
+
+proc scan-request {} {
set w .scan-window
global profile
global hostid
global scanView
global scanTerm
+ 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
set scanTerm {}
+ set b [lindex $queryButtonsFind $curIndexEntry]
+ set attr {}
+ foreach a [lrange [lindex $queryInfoFind [lindex $b 1]] 1 end] {
+ set attr "@attr $a $attr"
+ }
+ set title [lindex [lindex $queryInfoFind [lindex $b 1]] 0]
ir-scan z39.scan z39
if {![winfo exists $w]} {
toplevelG $w
- wm title $w "Scan"
-
wm minsize $w 0 0
top-down-window $w
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 destroyG $w] \
+ 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]
-
-# bind $w.top <Any-Enter> [list focus $w.top.entry]
+ focus $w.top.entry
}
+ bind $w.top.list <Double-Button-1> [list scan-copy %y $curIndexEntry]
+ wm title $w "Scan $title"
+
z39 callback [list scan-response $attr 0 35]
z39.scan numberOfTermsRequested 5
z39.scan preferredPositionInResponse 1
z39.scan scan "${attr} 0"
- show-status {Scan} 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 {Scan} 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 {Scan} 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 {Scan} 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 {Scan} 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
- show-status {Ready} 0 1
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} {
- 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
- if {$cancelFlag} {
- set cancelFlag 0
- return
- }
z39 callback {present-response}
z39.$setNo present $setOffset 1
- show-status {Retrieve} 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 {Retrieve} 1 0
+ show-status Retrieving 1 0
}
proc init-title-lines {} {
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]
if {$type == ""} {
break
}
+ .data.record tag bind r$o <Any-Enter> {}
+ .data.record tag bind r$o <Any-Leave> {}
set insert0 [.data.record index insert]
$ffunc $setno $o .data.record 1
.data.record tag add r$o $insert0 insert
.data.record tag bind r$o <1> \
- [list popup-marc $setno $o 0 $displayFormat]
+ [list popup-marc $setno $o 0 0]
+ update idletasks
+ }
+ if {!$busy} {
+ show-status Ready 0 1
}
}
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 {Finished} 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} {
+ 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} {
global profile
global csRadioType
$wno]
cascade-target-list
- puts $profile($target)
- destroyG $w
+ delete-target-hotlist $target
+ dputs $profile($target)
+ destroy $w
}
proc place-force {window parent} {
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}
set wno [lindex $profile($target) 12]
set w .setup-${wno}
-
- foreach i [lsort -decreasing \
- [$w.top.databases.list curselection]] {
- $w.top.databases.list delete $i
+ set l {}
+ foreach i [$w.top.databases.list curselection] {
+ set b [$w.top.databases.list get $i]
+ set l "$l $b"
+ }
+ set a [alert "Are you sure you want to remove the database(s)${l}?"]
+ if {$a} {
+ foreach i [lsort -decreasing \
+ [$w.top.databases.list curselection]] {
+ $w.top.databases.list delete $i
+ }
}
}
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 destroyG $w]
+ [list protocol-setup-action $target] [list destroy $w]
foreach sub {description host port idAuthentication \
maximumRecordSize preferredMessageSize} {
- puts $sub
+ dputs $sub
bind $w.top.$sub.entry <Control-a> [list add-database $target]
bind $w.top.$sub.entry <Control-d> [list delete-database $target]
}
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 6 -padx 6 -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"
+ 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 6 -padx 6 -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 6 -padx 6 -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 6 -padx 6 -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] \
- {Cancel} [list destroyG $w]] 0
+ {Delete} [list protocol-setup-delete $target] \
+ {Cancel} [list destroy $w]] 0
}
proc database-select-action {} {
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 {} {
global profile
foreach sub [winfo children .top.target.m.clist] {
- puts "deleting $sub"
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 [string tolower $n]
+ set nl [lindex $profile($n) 12]
if {[llength [lindex $profile($n) 7]] > 1} {
.top.target.m.clist add cascade -label $n \
-menu .top.target.m.clist.$nl
}
}
.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]
}
}
+proc query-select {i} {
+ global queryButtonsFind
+ global queryInfoFind
+ global queryButtons
+ global queryInfo
+
+ set queryInfoFind [lindex $queryInfo $i]
+ set queryButtonsFind [lindex $queryButtons $i]
+
+ index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
+}
+
+proc query-new-action {} {
+ global queryTypes
+ global queryButtons
+ global queryInfo
+ global settingsChanged
+
+ set settingsChanged 1
+ lappend queryTypes [.query-new.top.index.entry get]
+ lappend queryButtons {}
+ lappend queryInfo {}
+
+ destroy .query-new
+ cascade-query-list
+}
+
+proc query-new {} {
+ set w .query-new
+
+ toplevel $w
+ set oldFocus [focus]
+ place-force $w .
+ top-down-window $w
+ frame $w.top.index
+ pack $w.top.index \
+ -side top -anchor e -pady 2
+ entry-fields $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} {
+ global queryTypes
+ global queryButtons
+ global queryInfo
+ global settingsChanged
+
+ set settingsChanged 1
+
+ set queryTypes [lreplace $queryTypes $queryNo $queryNo]
+ set queryButtons [lreplace $queryButtons $queryNo $queryNo]
+ set queryInfo [lreplace $queryInfo $queryNo $queryNo]
+ destroy .query-delete
+ cascade-query-list
+}
+
+proc query-delete {queryNo} {
+ global queryTypes
+
+ set w .query-delete
+
+ toplevel $w
+ place-force $w .
+ top-down-window $w
+ set n [lindex $queryTypes $queryNo]
+
+ label $w.top.warning -bitmap warning
+ message $w.top.quest -text "Are you sure you want to delete the \
+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
+}
+
proc cascade-query-list {} {
global queryTypes
+ set w .top.options.m.query
set i 0
- .top.options.m.slist delete 0 last
+ $w.slist delete 0 last
foreach n $queryTypes {
- .top.options.m.slist add command -label $n \
- -command [list query-setup $i]
+ $w.slist add command -label $n -command [list query-setup $i]
incr i
}
set i 0
- .top.options.m.clist delete 0 last
+ $w.clist delete 0 last
+ foreach n $queryTypes {
+ $w.clist add command -label $n -command [list query-select $i]
+ incr i
+ }
+ set i 0
+ $w.dlist delete 0 last
foreach n $queryTypes {
- .top.options.m.clist add command -label $n \
- -command [list query-select $i]
+ $w.dlist add command -label $n -command [list query-delete $i]
incr i
}
}
proc save-geometry {} {
global windowGeometry
+ global hotTargets
+ global textWrap
+ global displayFormat
+ global popupMarcdf
+ global recordSyntax
set windowGeometry(.) [wm geometry .]
- set f [open "clientg.tcl" w]
-
+ 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"
foreach n [array names windowGeometry] {
puts -nonewline $f "set \{windowGeometry($n)\} \{"
puts -nonewline $f $windowGeometry($n)
}
proc save-settings {} {
- global hotTargets
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"
- puts $f "set hotTargets \{ $hotTargets \}"
foreach n [array names profile] {
puts -nonewline $f "set \{profile($n)\} \{"
global alertAnswer
toplevel $w
+ set oldFocus [focus]
place-force $w .
top-down-window $w
- message $w.top.message -text $ask
+ label $w.top.warning -bitmap warning
+ message $w.top.message -text $ask -aspect 300 \
+ -font -Adobe-Times-Medium-R-Normal-*-180-*
- pack $w.top.message -side left -pady 6 -padx 20 -expand yes -fill x
+ 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
}
proc exit-action {} {
global settingsChanged
- save-geometry
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
}
}
+ save-geometry
exit 0
}
}
}
+proc listbuttonv-action {button var names i} {
+ global $var
+
+ set $var [lindex $names [expr $i+1]]
+ $button configure -text [lindex $names $i]
+}
+
+proc listbuttonv {button var names} {
+ global $var
+
+ set n "-"
+ eval "set val $$var"
+ set l [llength $names]
+ for {set i 1} {$i < $l} {incr i 2} {
+ if {$val == [lindex $names $i]} {
+ incr i -1
+ set n [lindex $names $i]
+ break
+ }
+ }
+ if {[winfo exists $button]} {
+ $button configure -text $n
+ return
+ }
+ menubutton $button -text $n -menu ${button}.m \
+ -relief raised -border 1
+ menu ${button}.m
+ for {set i 0} {$i < $l} {incr i 2} {
+ ${button}.m add command -label [lindex $names $i] \
+ -command [list listbuttonv-action $button $var $names $i]
+ }
+}
+
proc query-add-index-action {queryNo} {
- set w .setup-query-$queryNo
+ set w .query-setup
global queryInfoTmp
global queryButtonsTmp
- lappend queryInfoTmp [list [.query-add-index.top.index.entry get] {}]
-
+ set newI [.query-add-index.top.index.entry get]
+ lappend queryInfoTmp [list $newI {}]
+ $w.top.index.list insert end $newI
destroy .query-add-index
#destroy $w.top.lines
#frame $w.top.lines -relief ridge -border 2
}
proc query-add-line {queryNo} {
- set w .setup-query-$queryNo
+ set w .query-setup
global queryInfoTmp
global queryButtonsTmp
}
proc query-del-line {queryNo} {
- set w .setup-query-$queryNo
+ set w .query-setup
global queryInfoTmp
global queryButtonsTmp
set w .query-add-index
toplevel $w
- place-force $w .setup-query-$queryNo
+ set oldFocus [focus]
+ place-force $w .query-setup
top-down-window $w
frame $w.top.index
pack $w.top.index \
-side top -anchor e -pady 2
entry-fields $w.top {index} \
{{Index Name:}} \
- [list query-add-index-action $queryNo] {destroy .query-add-index}
+ [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 queryInfoTmp
global queryButtonsFind
global queryInfoFind
+
+ global settingsChanged
+
+ set settingsChanged 1
set queryInfo [lreplace $queryInfo $queryNo $queryNo \
$queryInfoTmp]
set queryInfoFind $queryInfoTmp
set queryButtonsFind $queryButtonsTmp
- puts $queryInfo
- puts $queryButtons
- destroy .setup-query-$queryNo
-
+ destroy .query-setup
index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
}
proc activate-e-index {value no i} {
global queryButtonsTmp
+ global queryIndexTmp
- puts $queryButtonsTmp
set queryButtonsTmp [lreplace $queryButtonsTmp $no $no [list I $i]]
- puts $queryButtonsTmp
- puts "value $value"
- puts "no $no"
- puts "i $i"
+ dputs $queryButtonsTmp
+ set queryIndexTmp $i
}
proc activate-index {value no i} {
set queryButtonsFind [lreplace $queryButtonsFind $no $no [list I $i]]
- puts "queryButtonsFind $queryButtonsFind"
- puts "value $value"
- puts "no $no"
- puts "i $i"
+ dputs "queryButtonsFind $queryButtonsFind"
+}
+
+proc update-attr {} {
+ set w .index-setup
+ listbuttonv $w.top.relation.b relationTmpValue\
+ {{None} 0 {Less than} 1 {Greater than or equal} 2 {Equal} 3 \
+ {Greater than or equal} 4 {Greater than} 5 {Not equal} 6 \
+ {Phonetic} 100 {Stem} 101 {Relevance} 102 {AlwaysMatches} 103}
+ listbuttonv $w.top.position.b positionTmpValue {{None} 0 \
+ {First in field} 1 {First in subfield} 2 {Any position in field} 3}
+ listbuttonv $w.top.structure.b structureTmpValue {{None} 0 {Phrase} 1 \
+ {Word} 2 {Key} 3 {Year} 4 {Date (norm)} 5 {Word list} 6 \
+ {Date (un-norm)} 100 {Name (norm)} 101 {Date (un-norm)} 102 \
+ {Structure} 103 {urx} 104 {free-form} 105 {doc-text} 106 \
+ {local-number} 107 {string} 108 {numeric string} 109}
+ listbuttonv $w.top.truncation.b truncationTmpValue {{Auto} 0 {Right} 1 \
+ {Left} 2 {Left and right} 3 {No truncation} 100 \
+ {Process #} 101 {Re-1} 102 {Re-2} 103}
+ listbuttonv $w.top.completeness.b completenessTmpValue {{None} 0 \
+ {Incomplete subfield} 1 {Complete subfield} 2 {Complete field} 3}
+}
+
+proc use-attr {init} {
+ set attr {
+ {None} 0
+ {Personal name} 1
+ {Corporate name} 2
+ {Conference name} 3
+ {Title} 4
+ {Title-series} 5
+ {Title-uniform} 6
+ {ISBN} 7
+ {ISSN} 8
+ {LC card number} 9
+ {BNB card number} 10
+ {BGF(sic) number} 11
+ {Local number} 12
+ {Dewey classification} 13
+ {UDC classification} 14
+ {Bliss classification} 15
+ {LC call number} 16
+ {NLM call number} 17
+ {NAL call number} 18
+ {MOS call number} 19
+ {Local classification} 20
+ {Subject heading} 21
+ {Subject-RAMEAU} 22
+ {BDI-index-subject} 23
+ {INSPEC-subject} 24
+ {MESH-subject} 25
+ {PA-subject} 26
+ {LC-subject-heading} 27
+ {RVM-subject-heading} 28
+ {Local subject index} 29
+ {Date} 30
+ {Date of publication} 31
+ {Date of acquisition} 32
+ {Title-key} 33
+ {Title-collective} 34
+ {Title-parallel} 35
+ {Title-cover} 36
+ {Title-added-title-page} 37
+ {Title-caption} 38
+ {Title-running} 39
+ {Title-spine} 40
+ {Title-other-variant} 41
+ {Title-former} 42
+ {Title-abbreviated} 43
+ {Title-expanded} 44
+ {Subject-PRECIS} 45
+ {Subject-RSWK} 46
+ {Subject-subdivision} 47
+ {Number-natl-bibliography} 48
+ {Number-legal-deposit} 49
+ {Number-govt-publication} 50
+ {Number-publisher-for-music} 51
+ {Number-DB} 52
+ {Number-local-call} 53
+ {Code-language} 54
+ {Code-geographic-area} 55
+ {Code-institution} 56
+ {Name and title} 57
+ {Name-geographic} 58
+ {Place-publication} 59
+ {CODEN} 60
+ {Microform-generation} 61
+ {Abstract} 62
+ {Note} 63
+ {Author-title} 1000
+ {Record type} 1001
+ {Name} 1002
+ {Author} 1003
+ {Author-name-personal} 1004
+ {Author-name-corporate} 1005
+ {Author-name-conference} 1006
+ {Identifier-standard} 1007
+ {Subject-LC-children's} 1008
+ {Subject-name-personal} 1009
+ {Body of text} 1010
+ {Date/time added to database} 1011
+ {Date/time last modified} 1012
+ {Authority/format identifier} 1013
+ {Concept-text} 1014
+ {Concept-reference} 1015
+ {Any} 1016
+ {Server choice} 1017
+ {Publisher} 1018
+ {Record source} 1019
+ {Editor} 1020
+ {Bib-level} 1021
+ {Geographic class} 1022
+ {Indexed by} 1023
+ {Map scale} 1024
+ {Music key} 1025
+ {Related periodical} 1026
+ {Report number} 1027
+ {Stock number} 1028
+ {Thematic number} 1030
+ {Material type} 1031
+ {Doc ID} 1032
+ {Host item} 1033
+ {Content type} 1034
+ {Anywhere} 1035
+ }
+ set w .index-setup
+ global useTmpValue
+ set l [llength $attr]
+
+ if {$init} {
+ set s 0
+ set lno 0
+ for {set i 0} {$i < $l} {incr i} {
+ $w.top.use.list insert end [lindex $attr $i]
+ incr i
+ if {$useTmpValue == [lindex $attr $i]} {
+ set s $lno
+ }
+ incr lno
+ }
+ 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
+ }
+ $w.top.use.list yview $s
+ } else {
+ set lno [lindex [$w.top.use.list curselection] 0]
+ set i [expr $lno+$lno+1]
+ set useTmpValue [lindex $attr $i]
+ dputs "useTmpValue=$useTmpValue"
+ }
}
-proc query-setup {queryNo} {
- set w .setup-query-$queryNo
- global queryTypes
- set queryTypes {Simple}
- global queryButtons
- global queryInfo
- global queryButtonsTmp
- global queryInfoTmp
-
- set queryName [lindex $queryTypes $queryNo]
- set queryInfoTmp [lindex $queryInfo $queryNo]
- set queryButtonsTmp [lindex $queryButtons $queryNo]
+proc index-setup-action {oldAttr queryNo indexNo} {
+ set attr [lindex $oldAttr 0]
- #set queryButtons { {I 0 I 1 I 2} }
- #set queryInfo { { {Title ti} {Author au} {Subject sh} } }
+ global useTmpValue
+ global relationTmpValue
+ global structureTmpValue
+ global truncationTmpValue
+ global completenessTmpValue
+ global positionTmpValue
+ global queryInfoTmp
- toplevel $w
+ use-attr 0
+
+ dputs "index-setup-action"
+ dputs "queryNo $queryNo"
+ dputs "indexNo $indexNo"
+ if {$useTmpValue > 0} {
+ lappend attr "1=$useTmpValue"
+ }
+ if {$relationTmpValue > 0} {
+ lappend attr "2=$relationTmpValue"
+ }
+ if {$positionTmpValue > 0} {
+ lappend attr "3=$positionTmpValue"
+ }
+ if {$structureTmpValue > 0} {
+ lappend attr "4=$structureTmpValue"
+ }
+ if {$truncationTmpValue > 0} {
+ lappend attr "5=$truncationTmpValue"
+ }
+ if {$completenessTmpValue > 0} {
+ lappend attr "6=$completenessTmpValue"
+ }
+ dputs "new attr $attr"
+ set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
+ destroy .index-setup
+}
+
+proc index-setup {attr queryNo indexNo} {
+ set w .index-setup
+
+ global relationTmpValue
+ global structureTmpValue
+ global truncationTmpValue
+ global completenessTmpValue
+ global positionTmpValue
+ global useTmpValue
+ set relationTmpValue 0
+ set truncationTmpValue 0
+ set structureTmpValue 0
+ set positionTmpValue 0
+ set completenessTmpValue 0
+ set useTmpValue 0
+
+ set len [llength $attr]
+ for {set i 1} {$i < $len} {incr i} {
+ set q [lindex $attr $i]
+ set l [string first = $q]
+ if {$l > 0} {
+ set t [string range $q 0 [expr $l - 1]]
+ set v [string range $q [expr $l + 1] end]
+ switch $t {
+ 1
+ { set useTmpValue $v }
+ 2
+ { set relationTmpValue $v }
+ 3
+ { set positionTmpValue $v }
+ 4
+ { set structureTmpValue $v }
+ 5
+ { set truncationTmpValue $v }
+ 6
+ { set completenessTmpValue $v }
+ }
+ }
+ }
+ if {[winfo exists $w]} {
+ destroy $w
+ }
+ toplevelG $w
- wm title $w "Query setup $queryName"
- place-force $w .
+ set n [lindex $attr 0]
+ wm title $w "Index setup $n"
top-down-window $w
- frame $w.top.lines -relief ridge -border 2
frame $w.top.use -relief ridge -border 2
frame $w.top.relation -relief ridge -border 2
frame $w.top.position -relief ridge -border 2
frame $w.top.truncation -relief ridge -border 2
frame $w.top.completeness -relief ridge -border 2
- # Index Lines
-
- index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
-
- pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+ update-attr
# Use Attributes
+
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 20x10 \
- -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
-padx 2 -pady 2
$w.top.use.scroll config -command "$w.top.use.list yview"
- foreach u {{Personal name} {Corporate name}} {
- $w.top.use.list insert end $u
- }
+ use-attr 1
+
# Relation Attributes
- pack $w.top.relation -pady 6 -padx 6 -side top
+ pack $w.top.relation -pady 6 -padx 6 -side top
label $w.top.relation.label -text "Relation" -width 18
- listbutton $w.top.relation.b 0\
- {{None} {Less than} {Greater than or equal} \
- {Equal} {Greater than or equal} {Greater than} {Not equal} \
- {Phonetic} \
- {Stem} {Relevance} {AlwaysMatches}}
-
pack $w.top.relation.label $w.top.relation.b -fill x
# Position Attributes
- pack $w.top.position -pady 6 -padx 6 -side top
+ pack $w.top.position -pady 6 -padx 6 -side top
label $w.top.position.label -text "Position" -width 18
- listbutton $w.top.position.b 0 {{None} {First in field} {First in subfield}
- {Any position in field}}
-
pack $w.top.position.label $w.top.position.b -fill x
# Structure Attributes
pack $w.top.structure -pady 6 -padx 6 -side top
-
label $w.top.structure.label -text "Structure" -width 18
- listbutton $w.top.structure.b 0 {{None} {Phrase} {Word} {Key} {Year}
- {Date (norm)} {Word list} {Date (un-norm)} {Name (norm)} {Date (un-norm)}
- {Structure} {urx} {free-form} {doc-text} {local-number} {string}
- {numeric string}}
-
pack $w.top.structure.label $w.top.structure.b -fill x
# Truncation Attributes
pack $w.top.truncation -pady 6 -padx 6 -side top
-
label $w.top.truncation.label -text "Truncation" -width 18
- listbutton $w.top.truncation.b 0 {{Auto} {Right} {Left} {Left and right} \
- {No truncation} {Process #} {Re-1} {Re-2}}
pack $w.top.truncation.label $w.top.truncation.b -fill x
# Completeness Attributes
pack $w.top.completeness -pady 6 -padx 6 -side top
-
- label $w.top.completeness.label -text "Truncation" -width 18
+ label $w.top.completeness.label -text "Completeness" -width 18
- listbutton $w.top.completeness.b 0 {{None} {Incomplete subfield} \
- {Complete subfield} {Complete field}}
pack $w.top.completeness.label $w.top.completeness.b -fill x
# Ok-cancel
bottom-buttons $w [list \
+ {Ok} [list index-setup-action $attr $queryNo $indexNo] \
+ {Cancel} [list destroy $w]] 0
+
+}
+
+proc query-edit-index {queryNo} {
+ global queryInfoTmp
+ set w .query-setup
+
+ set i [lindex [$w.top.index.list curselection] 0]
+ if {$i == ""} {
+ return
+ }
+ set attr [lindex $queryInfoTmp $i]
+ dputs "Editing no $i $attr"
+ index-setup $attr $queryNo $i
+}
+
+proc query-delete-index {queryNo} {
+ global queryInfoTmp
+ global queryButtonsTmp
+ set w .query-setup
+
+ set i [lindex [$w.top.index.list curselection] 0]
+ if {$i == ""} {
+ return
+ }
+ set queryInfoTmp [lreplace $queryInfoTmp $i $i]
+ index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+ $w.top.index.list delete $i
+}
+
+proc query-setup {queryNo} {
+ set w .query-setup
+
+ global queryTypes
+ global queryButtons
+ global queryInfo
+ global queryButtonsTmp
+ global queryInfoTmp
+ global queryIndexTmp
+
+ set queryIndexTmp 0
+ set queryName [lindex $queryTypes $queryNo]
+ set queryInfoTmp [lindex $queryInfo $queryNo]
+ set queryButtonsTmp [lindex $queryButtons $queryNo]
+
+ toplevelG $w
+
+ wm minsize $w 0 0
+ wm title $w "Query setup $queryName"
+
+ top-down-window $w
+
+ frame $w.top.lines -relief ridge -border 2
+
+ pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+
+ # Index Lines
+
+ index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+
+ button $w.top.lines.add -text "Add" \
+ -command [list query-add-line $queryNo]
+ button $w.top.lines.del -text "Remove" \
+ -command [list query-del-line $queryNo]
+
+ pack $w.top.lines.del -fill x -side bottom
+ pack $w.top.lines.add -fill x -pady 10 -side bottom
+
+ # Indexes
+
+ frame $w.top.index -relief ridge -border 2
+ pack $w.top.index -pady 6 -padx 6 -side right -fill y
+
+ 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]
+
+ 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]} {
+ $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] \
- {Add line} [list query-add-line $queryNo] \
- {Delete line} [list query-del-line $queryNo] \
+ {Edit index} [list query-edit-index $queryNo] \
+ {Delete index} [list query-delete-index $queryNo] \
{Cancel} [list destroy $w]] 0
}
foreach b $queryButtonsFind {
set term [string trim [.lines.$i.e get]]
if {$term != ""} {
- set attr [lindex [lindex $queryInfoFind [lindex $b 1]] 1]
-
+ set attr [lrange [lindex $queryInfoFind [lindex $b 1]] 1 end]
+
+ set len [string length $term]
+ incr len -1
+ set left 0
+ set right 0
+ if {[string index $term $len] == "?"} {
+ set right 1
+ set term [string range $term 0 [expr $len - 1]]
+ }
+ if {[string index $term 0] == "?"} {
+ set left 1
+ set term [string range $term 1 end]
+ }
set term "\{${term}\}"
+ if {$right && $left} {
+ set term "@attr 5=3 ${term}"
+ } elseif {$right} {
+ set term "@attr 5=1 ${term}"
+ } elseif {$left} {
+ set term "@attr 5=2 ${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
+
+ if {! [tk4]} {
+ $w.$i configure -background red
+ }
+ set curIndexEntry $i
+}
+
proc index-lines {w realOp buttonInfo queryInfo handle} {
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
if {$realOp} {
if {! [winfo exists $w.$i.e]} {
entry $w.$i.e -width 32 -relief sunken -border 1
- bind $w.$i.e <FocusIn> [list $w.$i configure \
- -background red]
+ bind $w.$i.e <FocusIn> [list index-focus-in $w $i]
bind $w.$i.e <FocusOut> [list $w.$i configure \
-background white]
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
}
}
pack .data -side top -fill both -expand yes
pack .bot -fill x
-menubutton .top.file -text "File" -underline 0 -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 separator
.top.file.m add command -label "Exit" -command {exit-action}
-menubutton .top.target -text "Target" -underline 0 -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 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
cascade-target-list
-menubutton .top.service -text "Service" -underline 0 -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 "Query type" -menu .top.service.m.querytype
-menu .top.service.m.querytype
-.top.service.m.querytype add radiobutton -label "RPN"
-.top.service.m.querytype add radiobutton -label "CCL"
.top.service.m add cascade -label "Present" -menu .top.service.m.present
menu .top.service.m.present
-.top.service.m.present add command -label "More" \
+.top.service.m.present add command -label "10 More" \
-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 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
.top.rset.m add command -label "Load" -command {load-set}
.top.rset.m add separator
-menubutton .top.options -text "Options" -underline 0 -menu .top.options.m
+menubutton .top.options -text "Options" -menu .top.options.m
menu .top.options.m
-.top.options.m add cascade -label "Choose query" -menu .top.options.m.clist
-.top.options.m add command -label "Define query" -command {new-query-dialog}
-.top.options.m add cascade -label "Edit query" -menu .top.options.m.slist
+.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
+
+menu .top.options.m.query
+.top.options.m.query add cascade -label "Select" \
+ -menu .top.options.m.query.clist
+.top.options.m.query add cascade -label "Edit" \
+ -menu .top.options.m.query.slist
+.top.options.m.query add command -label "New" \
+ -command {query-new}
+.top.options.m.query add cascade -label "Delete" \
+ -menu .top.options.m.query.dlist
+
+menu .top.options.m.query.slist
+menu .top.options.m.query.clist
+menu .top.options.m.query.dlist
+cascade-query-list
-menu .top.options.m.slist
-menu .top.options.m.clist
menu .top.options.m.formats
-cascade-query-list
set i 0
foreach f $displayFormats {
- .top.options.m.formats add radiobutton -label $f \
- -command [list set-display-format $i]
+ .top.options.m.formats add radiobutton -label $f -value $i \
+ -command [list set-display-format $i] -variable displayFormat
incr i
}
+menu .top.options.m.wrap
+.top.options.m.wrap add radiobutton -label "Character" \
+ -value char -variable textWrap -command {set-wrap char}
+.top.options.m.wrap add radiobutton -label "Word" \
+ -value word -variable textWrap -command {set-wrap word}
+.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
+
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} \
- -command [list scan-request "@attr 1=4 @attr 5=1 @attr 4=1"] -state disabled
-button .mid.present -width 7 -text {Present} -command [list present-more 10] \
+button .mid.scan -text Scan \
+ -command scan-request -state disabled
+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]
+ -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-data -foreground black
-button .bot.logo -bitmap @book1 -command cancel-operation
+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
+ -side left -padx 2 -pady 2 -ipadx 1 -ipady 1
-#bind . <Any-Enter> {focus .lines.0.e}
-
-ir z39
-
-.top.options.m.formats invoke $displayFormat
-
+if {[catch {ir z39}]} {
+ set e [info sharedlibextension]
+ puts -nonewline "Loading irtcl..."
+ load irtcl$e
+ ir z39
+ puts "ok"
+}
+#z39 logLevel all
show-logo 1
projects / ir-tcl-moved-to-github.git / blobdiff