#
# $Log: client.tcl,v $
-# Revision 1.9 1995-03-17 18:26:16 adam
+# Revision 1.16 1995-03-31 08:56:36 adam
+# New button "Search".
+#
+# Revision 1.15 1995/03/28 12:45:22 adam
+# New ir method failback: called on disconnect/protocol error.
+# New ir set/get method: protocol: SR / Z3950.
+# Simple popup and disconnect when failback is invoked.
+#
+# Revision 1.14 1995/03/22 16:07:55 adam
+# Minor changes.
+#
+# Revision 1.13 1995/03/21 17:27:26 adam
+# Short-hand keys in setup.
+#
+# Revision 1.12 1995/03/21 13:41:03 adam
+# Comstack cs_create not used too often. Non-blocking connect.
+#
+# Revision 1.11 1995/03/21 10:39:06 adam
+# Diagnostic error message displayed with tkerror.
+#
+# Revision 1.10 1995/03/20 15:24:06 adam
+# Diagnostic records saved on searchResponse.
+#
+# Revision 1.9 1995/03/17 18:26:16 adam
# Non-blocking i/o used now. Database names popup as cascade items.
#
# Revision 1.8 1995/03/17 15:45:00 adam
set settingsChanged 0
set setNo 0
-wm minsize . 360 200
+wm minsize . 300 250
if {[file readable "~/.tk-c"]} {
source "~/.tk-c"
pack $w.top $w.bot -side top -fill both -expand yes
}
-proc top-down-ok-cancel {w ok-action} {
+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 -padx 5 -pady 5
button $w.bot.left.ok -width 6 -text {Ok} \
button $w.bot.cancel -width 6 -text {Cancel} \
-command "destroy $w"
pack $w.bot.cancel -side left -expand yes
-
- # Grab ...
- grab $w
-
- tkwait window $w
+
+ if {$g} {
+ # Grab ...
+ grab $w
+ tkwait window $w
+ }
}
proc show-target {target} {
frame $w.top -relief raised -border 1
frame $w.bot -relief raised -border 1
- # pack $w.top $w.bot -side top -fill both -expand yes
pack $w.top -side top -fill both -expand yes
pack $w.bot -fill both
- text $w.top.record -width 60 -height 10 -wrap word \
+ text $w.top.record -width 60 -height 12 -wrap word \
-yscrollcommand [list $w.top.s set]
scrollbar $w.top.s -command [list $w.top.record yview]
destroy .target-define
}
+proc fail-response {target} {
+ close-target
+ tkerror "Target connection closed or protocol error"
+}
+
+proc connect-response {target} {
+ puts "connect-response"
+ show-target $target
+ init-request
+}
+
proc open-target {target base} {
global profile
+ global hostid
- .top.target.m disable 0
- .top.target.m enable 1
z39 disconnect
z39 comstack [lindex $profile($target) 6]
# z39 idAuthentication [lindex $profile($target) 3]
} else {
z39 databaseNames $base
}
- show-target $target
- z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
- init-request
+ z39 failback [list fail-response $target]
+ z39 callback [list connect-response $target]
+ z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
+ show-status {Connecting} 1
+ set hostid $target
+ .top.target.m disable 0
+ .top.target.m enable 1
+}
+
+proc close-target {} {
+ global hostid
+
+ set hostid Default
+ z39 disconnect
+ show-target {None}
+ show-status {Not connected} 0
+ show-message {}
+ .top.target.m disable 1
+ .top.target.m enable 0
}
proc load-set-action {} {
set fname [.load-set.top.filename.entry get]
destroy .load-set
if {$fname != ""} {
- .data.list delete 0 end
+ init-title-lines
show-status {Loading} 1
z39.$setNo loadFile $fname
set no [z39.$setNo numberOfRecordsReturned]
- add-title-lines $no 1
+ add-title-lines $setNo $no 1
}
show-status {Ready} 0
}
proc load-set {} {
set w .load-set
+ set oldFocus [focus]
toplevel $w
place-force $w .
{{Filename:}} \
{load-set-action} {destroy .load-set}
- top-down-ok-cancel $w {load-set-action}
+ top-down-ok-cancel $w {load-set-action} 1
+ focus $oldFocus
}
proc init-request {} {
z39 callback {init-response}
z39 init
show-status {Initializing} 1
- set setNo 0
}
proc init-response {} {
show-status {Ready} 0
- pack .mid.searchlabel .mid.searchentry -side left
bind .mid.searchentry <Return> search-request
focus .mid.searchentry
}
proc search-request {} {
global setNo
+ global profile
+ global hostid
+
+ set target $hostid
incr setNo
ir-set z39.$setNo
+ if {[lindex $profile($target) 10]} {
+ z39.$setNo setName $setNo
+ }
+ if {[lindex $profile($target) 8]} {
+ z39 query rpn
+ }
+ if {[lindex $profile($target) 9]} {
+ z39 query ccl
+ }
z39 callback {search-response}
z39.$setNo search [.mid.searchentry get]
show-status {Search} 1
global setOffset
global setMax
- .data.list delete 0 end
+ init-title-lines
show-status {Ready} 0
show-message "[z39.$setNo resultCount] hits"
set setMax [z39.$setNo resultCount]
puts $setMax
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
+ if {$setMax > 4} {
+ set setMax 4
}
z39 callback {present-response}
set setOffset 1
- z39.$setNo present 1 $setMax
+ z39.$setNo present $setOffset $setMax
show-status {Retrieve} 1
}
-proc add-title-lines {no offset} {
+proc present-more {number} {
global setNo
+ global setOffset
+ global setMax
+
+ puts "present-more"
+ set max [z39.$setNo resultCount]
+ if {$max <= $setMax} {
+ return
+ }
+ puts "max=$max"
+ puts "setOffset=$setOffset"
+ if {$number == ""} {
+ set setMax $max
+ } else {
+ incr setMax $number
+ }
+ z39 callback {present-response}
+ z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
+ show-status {Retrieve} 1
+}
+
+proc init-title-lines {} {
+ .data.list delete 0 end
+}
+proc add-title-lines {setno no offset} {
for {set i 0} {$i < $no} {incr i} {
set o [expr $i + $offset]
- set title [lindex [z39.$setNo recordMarc $o field 245 * a] 0]
- set year [lindex [z39.$setNo recordMarc $o field 260 * c] 0]
+ set title [lindex [z39.$setno recordMarc $o field 245 * a] 0]
+ set year [lindex [z39.$setno recordMarc $o field 260 * c] 0]
set nostr [format "%3d" $o]
.data.list insert end "$nostr $title - $year"
}
puts "In present-response"
set no [z39.$setNo numberOfRecordsReturned]
puts "Returned $no records, setOffset $setOffset"
- add-title-lines $no $setOffset
+ add-title-lines $setNo $no $setOffset
set setOffset [expr $setOffset + $no]
- if { $setOffset <= $setMax} {
+ set status [z39.$setNo responseStatus]
+ if {[lindex $status 0] == "NSD"} {
+ show-status {Ready} 0
+ set code [lindex $status 1]
+ set msg [lindex $status 2]
+ set addinfo [lindex $status 3]
+ tkerror "NSD$code: $msg: $addinfo"
+ return
+ }
+ if {$no > 0 && $setOffset <= $setMax} {
z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
} else {
show-status {Finished} 0
set label ${parent}.${field}.label
set entry ${parent}.${field}.entry
label $label -text [lindex $tlist $i] -anchor e
- entry $entry -width 28 -relief sunken
+ entry $entry -width 32 -relief sunken
pack $label -side left
pack $entry -side right
lappend alist $entry
{{Target:}} \
{define-target-action} {destroy .target-define}
- top-down-ok-cancel $w {define-target-action}
-}
-
-proc close-target {} {
- pack forget .mid.searchlabel .mid.searchentry
- z39 disconnect
- show-target {None}
- show-status {Not connected} 0
- show-message {}
- .top.target.m disable 1
- .top.target.m enable 0
+ top-down-ok-cancel $w {define-target-action} 1
}
proc protocol-setup-action {target} {
global profile
global csRadioType
global settingsChanged
+ global RPNCheck
+ global CCLCheck
+ global ResultSetCheck
+
+ set w .setup-${target}.top
- set w .protocol-setup.top
+ #set w .protocol-setup.top
set b {}
set settingsChanged 1
[$w.maximumRecordSize.entry get] \
[$w.preferredMessageSize.entry get] \
$csRadioType \
- $b]
+ $b \
+ $RPNCheck \
+ $CCLCheck \
+ $ResultSetCheck ]
cascade-target-list
puts $profile($target)
- destroy .protocol-setup
+ destroy .setup-${target}
}
}
-proc add-database-action {} {
- .protocol-setup.top.databases.list insert end \
+proc add-database-action {target} {
+ set w .setup-${target}
+
+ ${w}.top.databases.list insert end \
[.database-select.top.database.entry get]
destroy .database-select
}
-proc add-database {} {
+proc add-database {target} {
set w .database-select
+ set oldFocus [focus]
toplevel $w
- place-force $w .protocol-setup
+ place-force $w .setup-${target}
top-down-window $w
entry-fields $w.top {database} \
{{Database to add:}} \
- {add-database-action} {destroy .database-select}
+ [list add-database-action $target] {destroy .database-select}
- top-down-ok-cancel $w {add-database-action}
+ top-down-ok-cancel $w [list add-database-action $target] 1
+ focus $oldFocus
}
-proc delete-database {} {
+proc delete-database {target} {
+ set w .setup-${target}
+
foreach i [lsort -decreasing \
- [.protocol-setup.top.databases.list curselection]] {
- .protocol-setup.top.databases.list delete $i
+ [$w.top.databases.list curselection]] {
+ $w.top.databases.list delete $i
}
}
proc protocol-setup {target} {
- set w .protocol-setup
+ set w .setup-$target
global profile
global csRadioType
+ global RPNCheck
+ global CCLCheck
+ global ResultSetCheck
toplevel $w
pack $w.top.description $w.top.host $w.top.port \
$w.top.idAuthentication $w.top.maximumRecordSize \
$w.top.preferredMessageSize -side top -anchor e -pady 2
- #-anchor e
entry-fields $w.top {description host port idAuthentication \
maximumRecordSize preferredMessageSize} \
{{Description:} {Host:} {Port:} {Id Authentification:} \
{Maximum Record Size:} {Preferred Message Size:}} \
- [list protocol-setup-action $target] {destroy .protocol-setup}
+ [list protocol-setup-action $target] [list destroy $w]
+ foreach sub {description host port idAuthentication \
+ maximumRecordSize preferredMessageSize} {
+ puts $sub
+ bind $w.top.$sub.entry <Control-a> "add-database $target"
+ bind $w.top.$sub.entry <Control-d> "delete-database $target"
+ }
$w.top.description.entry insert 0 [lindex $profile($target) 0]
$w.top.host.entry insert 0 [lindex $profile($target) 1]
$w.top.port.entry insert 0 [lindex $profile($target) 2]
$w.top.idAuthentication.entry insert 0 [lindex $profile($target) 3]
$w.top.maximumRecordSize.entry insert 0 [lindex $profile($target) 4]
$w.top.preferredMessageSize.entry insert 0 [lindex $profile($target) 5]
+ set csRadioType [lindex $profile($target) 6]
+ set RPNCheck [lindex $profile($target) 8]
+ set CCLCheck [lindex $profile($target) 9]
+ set ResultSetCheck [lindex $profile($target) 10]
# Databases ....
pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
label $w.top.databases.label -text "Databases"
- button $w.top.databases.add -text "Add" -command {add-database}
- button $w.top.databases.delete -text "Delete" -command {delete-database}
+ button $w.top.databases.add -text "Add" \
+ -command "add-database $target"
+ button $w.top.databases.delete -text "Delete" \
+ -command "delete-database $target"
listbox $w.top.databases.list -geometry 20x6 \
-yscrollcommand "$w.top.databases.scroll set"
scrollbar $w.top.databases.scroll -orient vertical -border 1
foreach b [lindex $profile($target) 7] {
$w.top.databases.list insert end $b
}
-
- # Transport ...
- set csRadioType [lindex $profile($target) 6]
+ # Transport ...
pack $w.top.cs-type -pady 6 -padx 6 -side top
label $w.top.cs-type.label -text "Transport"
pack $w.top.query -pady 6 -padx 6 -side top
label $w.top.query.label -text "Query support" -anchor e
- checkbutton $w.top.query.c1 -text "CCL query"
- checkbutton $w.top.query.c2 -text "RPN query"
- checkbutton $w.top.query.c3 -text "Result sets"
+ checkbutton $w.top.query.c1 -text "RPN query" -variable RPNCheck
+ checkbutton $w.top.query.c2 -text "CCL query" -variable CCLCheck
+ checkbutton $w.top.query.c3 -text "Result sets" -variable ResultSetCheck
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
-
- top-down-ok-cancel $w [list protocol-setup-action $target]
+
+ # Ok-cancel
+ top-down-ok-cancel $w [list protocol-setup-action $target] 0
}
proc database-select-action {} {
top-down-window $w
- if {$hostid == ""} {
- set hostid Default
- }
-
frame $w.top.databases -relief ridge -border 2
pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
foreach b [lindex $profile($hostid) 7] {
$w.top.databases.list insert end $b
}
- top-down-ok-cancel $w {database-select-action}
+ top-down-ok-cancel $w {database-select-action} 1
}
proc cascade-target-list {} {
pack $w.top.message -side left -pady 6 -padx 20 -expand yes -fill x
set alertAnswer 0
- top-down-ok-cancel $w {alert-action}
+ top-down-ok-cancel $w {alert-action} 1
return $alertAnswer
}
pack .data -side top -fill both -expand yes
pack .bot -fill x
-menubutton .top.file -text "File" -menu .top.file.m
+menubutton .top.file -text "File" -underline 0 -menu .top.file.m
menu .top.file.m
.top.file.m add command -label "Save settings" -command {save-settings}
.top.file.m add command -label "Load Set" -command {load-set}
.top.file.m add separator
.top.file.m add command -label "Exit" -command {exit-action}
-menubutton .top.target -text "Target" -menu .top.target.m
+menubutton .top.target -text "Target" -underline 0 -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.database -text "Database" -menu .top.database.m
-menu .top.database.m
-.top.database.m add command -label "Select ..." -command {database-select}
-.top.database.m add command -label "Add ..." -command {puts "Add"}
+menubutton .top.search -text "Search" -underline 0 -menu .top.search.m
+menu .top.search.m
+.top.search.m add command -label "Database" -command {database-select}
+.top.search.m add cascade -label "Query type" -menu .top.search.m.querytype
+menu .top.search.m.querytype
+.top.search.m.querytype add radiobutton -label "RPN"
+.top.search.m.querytype add radiobutton -label "CCL"
+.top.search.m add cascade -label "Present" -menu .top.search.m.present
+menu .top.search.m.present
+.top.search.m.present add command -label "More" -command [list present-more 10]
+.top.search.m.present add command -label "All" -command [list present-more {}]
menubutton .top.help -text "Help" -menu .top.help.m
menu .top.help.m
.top.help.m add command -label "Help on help" -command {puts "Help on help"}
.top.help.m add command -label "About" -command {puts "About"}
-pack .top.file .top.target .top.database -side left
+pack .top.file .top.target .top.search -side left
pack .top.help -side right
label .mid.searchlabel -text {Search:}
-entry .mid.searchentry -width 40 -relief sunken
+entry .mid.searchentry -width 32 -relief sunken
+pack .mid.searchlabel -side left
+pack .mid.searchentry -side left -fill x -expand yes
+focus .mid.searchentry
bind .mid.searchentry <Left> {left-cursor .mid.searchentry}
bind .mid.searchentry <Right> {right-cursor .mid.searchentry}
message .bot.target -text "None" -aspect 1000 -relief sunken -border 1
label .bot.status -text "Not connected" -width 12 -relief \
- sunken -anchor w -border 1
-label .bot.message -text "" -width 20 -relief \
- sunken -anchor w -border 1
-pack .bot.target .bot.status .bot.message -anchor nw -side left -padx 2 -pady 2
+ sunken -anchor w -border 1
+label .bot.set -textvariable setNo -width 5 -relief \
+ sunken -anchor w -border 1
+label .bot.message -text "" -width 14 -relief \
+ sunken -anchor w -border 1
+pack .bot.target .bot.status .bot.set .bot.message -anchor nw \
+ -side left -padx 2 -pady 2
bind .data.list <Double-Button-1> {set indx [.data.list nearest %y]
show-full-marc $indx}
projects / ir-tcl-moved-to-github.git / blobdiff