# Sebastian Hammer, Adam Dickmeiss
#
# $Log: client.tcl,v $
-# Revision 1.37 1995-06-13 14:37:59 adam
+# 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.
set hotInfo {}
set busy 0
-set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
+set libDir ""
+
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} Z39}
set hostid Default
set settingsChanged 0
set setNo 0
set lastSetNo 0
set cancelFlag 0
set searchEnable 0
+set scanEnable 0
set fullMarcSeq 0
set displayFormat 1
+set popupMarcdf 0
+set textWrap word
set queryTypes {Simple}
set queryButtons { { {I 0} {I 1} {I 2} } }
{Subject {1=21}} {Any {1=1016}} } }
wm minsize . 0 0
+set setOffset 0
+set setMax 0
+
proc read-formats {} {
global displayFormats
set formats [glob -nocomplain formats/*.tcl]
}
}
+proc set-wrap {m} {
+ global textWrap
+
+ set textWrap $m
+ .data.record configure -wrap $m
+}
+
+proc dputs {m} {
+# puts $m
+}
+
proc set-display-format {f} {
global displayFormat
global setNo
+ global busy
set displayFormat $f
if {$setNo == 0} {
return
}
+ if {!$busy} {
+ .bot.a.status configure -text "Reformatting"
+ }
+ update idletasks
add-title-lines 0 10000 1
+ if {!$busy} {
+ .bot.a.status configure -text "Ready"
+ }
}
proc initBindings {} {
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} {
set cancelFlag 1
if {$busy} {
- show-status Cancelled 0 {}
+ show-status Canceling 0 {}
}
}
-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
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}
after 140 [list show-logo $v1]
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} {
+ .top.service.m disable 1
+ } elseif {$setOffset > 0 && $setOffset <= [z39.$setNo resultCount]} {
+ .top.service.m enable 1
+ .mid.present configure -state normal
+ } else {
+ .top.service.m disable 1
+ }
if {[winfo exists .scan-window]} {
.scan-window.bot.2 configure -state normal
.scan-window.bot.4 configure -state normal
}
}
+proc popup-license {} {
+ 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
+
+ set f [open "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
bottom-buttons $w [list {Close} [list destroy $w]] 1
}
-proc about-origin {} {
+proc about-origin-logo {n} {
set w .about-origin-w
+ if {![winfo exists $w]} {
+ return
+ }
+ incr n
+ if {$n==10} {
+ set n 1
+ }
+ $w.top.a.logo configure -bitmap @book$n
+ after 140 [list about-origin-logo $n]
+}
- toplevelG $w
+proc about-origin {} {
+ set w .about-origin-w
+
+ if {[winfo exists $w]} {
+ destroy $w
+ }
+ toplevel $w
wm title $w "About IrTcl"
place-force $w .
pack $w.top.a $w.top.p -side top -fill x
- label $w.top.a.about -text "About"
label $w.top.a.irtcl -text "IrTcl" \
-font -Adobe-Helvetica-Bold-R-Normal-*-240-*
- pack $w.top.a.about $w.top.a.irtcl -side top
+ label $w.top.a.logo -bitmap @book1
+ pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
set i [z39 implementationName]
label $w.top.p.in -text "Implementation name: $i"
set i [z39 implementationId]
label $w.top.p.ii -text "Implementation id: $i"
+ set i [z39 implementationVersion]
+ label $w.top.p.iv -text "Implementation version: $i"
- pack $w.top.p.in $w.top.p.ii -side top -anchor nw
+ pack $w.top.p.in $w.top.p.ii $w.top.p.iv -side top -anchor nw
- bottom-buttons $w [list {Close} [list destroy $w]] 1
+ 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
set new 1
}
$w.top.record delete 0.0 end
- wm title $w "Record #$no"
+ set recordType [z39.$sno recordType $no]
+ wm title $w "$recordType record #$no"
set ffunc [lindex $displayFormats $df]
set ffunc "display-$ffunc"
- $ffunc $sno $no $w.top.record 0
+ $ffunc $sno $no $w.top.record 0
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 destroy $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
}
}
}
-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 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 hotTargets [linsert $hotTargets 0 [list $target $base]]
set-target-hotlist
}
global hotTargets
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]]
tkerror "Target connection closed or protocol error"
}
-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 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 Ready 0 {}
+ return
+ }
# z39 options search present scan namedResultSets triggerResourceCtrl
- show-status {Connecting} 1 {}
set hostid $target
.top.target.m disable 0
.top.target.m enable 1
proc close-target {} {
global hostid
global cancelFlag
+ global setNo
set cancelFlag 0
+ set setNo 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
destroy .load-set
if {$fname != ""} {
show-status {Loading} 1 {}
+ update
z39.$setNo loadFile $fname
set no [z39.$setNo numberOfRecordsReturned]
toplevel $w
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} \
}
z39 callback {init-response}
show-status {Initializing} 1 {}
- z39 init
+ 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
}
}
}
incr setNo
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
}
z39 callback {search-response}
z39.$setNo search $query
- show-status {Search} 1 0
+ show-status {Searching} 1 0
+}
+
+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 {} {
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
{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]
}
+ 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 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
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 {$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
}
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
}
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 cancelFlag
global busy
- puts "In search-response"
+ dputs "In search-response"
init-title-lines
- show-status {Ready} 0 1
set setMax [z39.$setNo resultCount]
show-message "${setMax} hits"
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 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 {Retrieve} 1 0
+ show-status {Retrieving} 1 0
}
proc present-more {number} {
global setOffset
global setMax
- puts "setOffset=$setOffset"
- puts "present-more"
+ dputs "setOffset=$setOffset"
+ dputs "present-more"
if {$setNo == 0} {
- puts "setNo=$setNo"
+ dputs "setNo=$setNo"
return
}
set max [z39.$setNo resultCount]
if {$max <= $setOffset} {
- puts "max=$max"
- puts "setOffset=$setOffset"
+ dputs "max=$max"
+ dputs "setOffset=$setOffset"
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 {} {
$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
}
}
global setMax
global cancelFlag
- 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]
set status [z39.$setNo responseStatus]
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
}
}
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
+ }
+}
+
proc protocol-setup-action {target} {
global profile
global csRadioType
$wno]
cascade-target-list
- puts $profile($target)
+ dputs $profile($target)
destroy $w
}
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.host
frame $w.top.port
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 4 -padx 4 -expand yes -fill both
label $w.top.databases.label -text "Databases"
button $w.top.databases.add -text "Add" \
}
# Transport ...
- pack $w.top.cs-type -pady 6 -padx 6 -side top -fill x
+ pack $w.top.cs-type -pady 4 -padx 4 -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
# Protocol ...
- pack $w.top.protocol -pady 6 -padx 6 -side top -fill x
+ pack $w.top.protocol -pady 4 -padx 4 -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
# Query ...
- pack $w.top.query -pady 6 -padx 6 -side top -fill x
+ pack $w.top.query -pady 4 -padx 4 -side top -fill x
label $w.top.query.label -text "Query support"
checkbutton $w.top.query.c1 -text "RPN query" -anchor w -variable RPNCheck
# Ok-cancel
bottom-buttons $w [list {Ok} [list protocol-setup-action $target] \
+ {Delete} [list protocol-setup-delete $target] \
{Cancel} [list destroy $w]] 0
}
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] {
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
frame $w.top.index
pack $w.top.index \
-side top -anchor e -pady 2
- entry-fields $w.top {index} \
+ entry-fields $w.top index \
{{Query Name:}} \
query-new-action {destroy .query-new}
top-down-ok-cancel $w query-new-action 1
}
+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 200
+ 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
$w.clist add command -label $n -command [list query-select $i]
incr i
}
+ set i 0
+ $w.dlist delete 0 last
+ foreach n $queryTypes {
+ $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
set windowGeometry(.) [wm geometry .]
set f [open "clientg.tcl" w]
+ puts $f "set hotTargets \{ $hotTargets \}"
+ puts $f "set textWrap $textWrap"
+ puts $f "set displayFormat $displayFormat"
+ puts $f "set popupMarcdf $popupMarcdf"
foreach n [array names windowGeometry] {
puts -nonewline $f "set \{windowGeometry($n)\} \{"
puts -nonewline $f $windowGeometry($n)
}
proc save-settings {} {
- global hotTargets
global profile
global settingsChanged
global queryTypes
set f [open "clientrc.tcl" w]
puts $f "# Setup file"
- puts $f "set hotTargets \{ $hotTargets \}"
foreach n [array names profile] {
puts -nonewline $f "set \{profile($n)\} \{"
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 200 \
+ -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
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
}
}
proc query-add-index-action {queryNo} {
- set w .setup-query
+ 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
+ set w .query-setup
global queryInfoTmp
global queryButtonsTmp
}
proc query-del-line {queryNo} {
- set w .setup-query
+ set w .query-setup
global queryInfoTmp
global queryButtonsTmp
set w .query-add-index
toplevel $w
- place-force $w .setup-query
+ 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
}
global queryInfo
global queryButtonsTmp
global queryInfoTmp
+ global queryButtonsFind
+ global queryInfoFind
+
global settingsChanged
set settingsChanged 1
$queryInfoTmp]
set queryButtons [lreplace $queryButtons $queryNo $queryNo \
$queryButtonsTmp]
- destroy .setup-query
+ set queryInfoFind $queryInfoTmp
+ set queryButtonsFind $queryButtonsTmp
+
+ destroy .query-setup
+ index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
}
proc activate-e-index {value no i} {
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 {} {
set lno [lindex [$w.top.use.list curselection] 0]
set i [expr $lno+$lno+1]
set useTmpValue [lindex $attr $i]
+ dputs "useTmpValue=$useTmpValue"
}
}
use-attr 0
+ dputs "index-setup-action"
+ dputs "queryNo $queryNo"
+ dputs "indexNo $indexNo"
if {$useTmpValue > 0} {
lappend attr "1=$useTmpValue"
}
if {$completenessTmpValue > 0} {
lappend attr "6=$completenessTmpValue"
}
+ dputs "new attr $attr"
set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
destroy .index-setup
}
}
}
}
+ if {[winfo exists $w]} {
+ destroy $w
+ }
toplevelG $w
set n [lindex $attr 0]
proc query-edit-index {queryNo} {
global queryInfoTmp
- global queryIndexTmp
+ 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 attr [lindex $queryInfoTmp $queryIndexTmp]
- puts "Editing $attr"
- index-setup $attr $queryNo $queryIndexTmp
+ 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 .setup-query
+ set w .query-setup
global queryTypes
global queryButtons
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
- pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+ 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]
- # Ok-cancel
+ 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
+
+ $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] \
- {Add line} [list query-add-line $queryNo] \
- {Delete line} [list query-del-line $queryNo] \
+ {Delete index} [list query-delete-index $queryNo] \
{Cancel} [list destroy $w]] 0
}
if {$term != ""} {
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
}
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}
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}
+.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 "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
menu .top.options.m.query
-.top.options.m.query add cascade -label "Choose query" \
+.top.options.m.query add cascade -label "Select" \
-menu .top.options.m.query.clist
-.top.options.m.query add cascade -label "Edit query" \
+.top.options.m.query add cascade -label "Edit" \
-menu .top.options.m.query.slist
-.top.options.m.query add command -label "Define query" \
+.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.formats
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}
+
menubutton .top.help -text "Help" -menu .top.help.m
menu .top.help.m
-fill y -padx 5 -pady 3
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]
pack .data.scroll -side right -fill y
pack .data.record -expand yes -fill both
pack .bot.a.status .bot.a.set .bot.a.message \
-side left -padx 2 -pady 2
-#bind . <Any-Enter> {focus .lines.0.e}
-
ir z39
-#.top.options.m.formats invoke $displayFormat
-
show-logo 1
projects / ir-tcl-moved-to-github.git / blobdiff