#
# $Log: client.tcl,v $
-# Revision 1.26 1995-06-01 16:36:46 adam
+# Revision 1.30 1995-06-06 11:35:41 adam
+# Work on scan. Display of old sets.
+#
+# Revision 1.29 1995/06/05 14:11:18 adam
+# Bug fix in present-more.
+#
+# Revision 1.28 1995/06/02 14:52:13 adam
+# Minor changes really.
+#
+# Revision 1.27 1995/06/02 14:29:42 adam
+# Work on scan interface - up/down buttons.
+#
+# Revision 1.26 1995/06/01 16:36:46 adam
# About buttons. Minor bug fixes.
#
# Revision 1.25 1995/05/31 13:09:57 adam
return
}
if {$sb} {
- .top.search configure -state normal
+ .top.service configure -state normal
.mid.search configure -state normal
.mid.scan configure -state normal
.mid.present configure -state normal
+ if {[winfo exists .scan-window]} {
+ .scan-window.bot.2 configure -state normal
+ .scan-window.bot.4 configure -state normal
+ }
set searchEnable 1
} else {
- .top.search configure -state disabled
+ .top.service configure -state disabled
.mid.search configure -state disabled
.mid.scan configure -state disabled
.mid.present configure -state disabled
+
+ if {[winfo exists .scan-window]} {
+ .scan-window.bot.2 configure -state disabled
+ .scan-window.bot.4 configure -state disabled
+ }
set searchEnable 0
}
}
label $w.top.ii -text "Implementation id: $i"
set i [z39 targetImplementationVersion]
label $w.top.iv -text "Implementation version: $i"
+ set i [z39 options]
+ label $w.top.op -text "Protocol options: $i"
- pack $w.top.in $w.top.ii $w.top.iv -side top -anchor nw
+ pack $w.top.in $w.top.ii $w.top.iv $w.top.op -side top -anchor nw
bottom-buttons $w [list {Close} [list destroy $w]] 1
}
bottom-buttons $w [list {Close} [list destroy $w]] 1
}
-proc show-full-marc {no b} {
- global setNo
+proc show-full-marc {sno no b} {
global fullMarcSeq
- if {[z39.$setNo type $no] != "DB"} {
+ if {[z39.$sno type $no] != "DB"} {
return
}
if {$b} {
set new 1
}
- set r [z39.$setNo getMarc $no list * * *]
+ set r [z39.$sno getMarc $no list * * *]
$w.top.record tag configure marc-tag -foreground blue
$w.top.record tag configure marc-data -foreground black
bottom-buttons $w [list \
{Close} [list destroy $w] \
- {Duplicate} [list show-full-marc $no 1]] 0
+ {Duplicate} [list show-full-marc $sno $no 1]] 0
}
}
puts [z39 maximumRecordSize]
puts -nonewline "preferredMessageSize="
puts [z39 preferredMessageSize]
+ show-status {Connecting} 0 0
if {$base == ""} {
z39 databaseNames [lindex [lindex $profile($target) 7] 0]
} else {
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 0
+# z39 options search present scan namedResultSets triggerResourceCtrl
+ show-status {Connecting} 1 {}
set hostid $target
.top.target.m disable 0
.top.target.m enable 1
set no [z39.$setNo numberOfRecordsReturned]
add-title-lines $setNo $no 1
}
+ set l [format "%-4d %7d" $setNo $no]
+ .top.rset.m add command -label $l \
+ -command [list add-title-lines $setNo 10000 1]
show-status {Ready} 0 {}
}
show-status {Search} 1 0
}
-proc scan-request {} {
+proc scan-request {attr} {
set w .scan-window
global profile
global hostid
+ global scanView
+ global scanTerm
set target $hostid
+ set scanView 0
+ set scanTerm {}
ir-scan z39.scan z39
- z39 callback {scan-response}
if {![winfo exists $w]} {
toplevel $w
wm title $w "Scan"
- wm minsize $w 200 200
+ 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 -geometry 50x14
+ 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 -geometry 50x14
- scrollbar $w.top.scroll -orient vertical -border 1
- pack $w.top.list -side left -fill both -expand yes
- pack $w.top.scroll -side right -fill y
- $w.top.scroll config -command [list $w.top.list yview]
+ bottom-buttons $w [list {Close} [list destroy $w] \
+ {Up} [list scan-up $attr] \
+ {Down} [list scan-down $attr]] 0
+ bind $w.top.list <Up> [list scan-up $attr]
+ bind $w.top.list <Down> [list scan-down $attr]
+ }
+ focus $w.top.entry
+ z39 callback [list scan-response $attr 0 25]
+ z39.scan numberOfTermsRequested 5
+ z39.scan preferredPositionInResponse 1
+ z39.scan scan "${attr} 0"
+
+ show-status {Scan} 1 0
+}
+
+proc scan-term-h {attr} {
+ global busy
+ global scanTerm
- bottom-buttons $w [list {Close} [list destroy $w]] 0
+ if {$busy} {
+ return
+ }
+ set w .scan-window
+ set nScanTerm [$w.top.entry get]
+ if {$nScanTerm == $scanTerm} {
+ return
+ }
+ set scanTerm $nScanTerm
+ z39 callback [list scan-response $attr 0 25]
+ z39.scan numberOfTermsRequested 5
+ z39.scan preferredPositionInResponse 1
+ $w.top.list delete 0 end
+ puts "${attr} \{${scanTerm}\}"
+ if {$scanTerm == ""} {
+ z39.scan scan "${attr} 0"
+ } else {
+ z39.scan scan "${attr} \{${scanTerm}\}"
}
- z39.scan numberOfTermsRequested 100
- z39.scan scan "@attr 1=4 0"
-
show-status {Scan} 1 0
}
-proc scan-response {} {
+proc scan-response {attr start toget} {
+ global cancelFlag
+ global scanTerm
+
set w .scan-window
+ puts "In scan-response"
set m [z39.scan numberOfEntriesReturned]
puts $m
- for {set i 0} {$i < $m} {incr i} {
- set term [lindex [z39.scan scanLine $i] 1]
- set nostr [format "%7d" [lindex [z39.scan scanLine $i] 2]]
+ puts attr=$attr
+ puts start=$start
+ puts toget=$toget
- $w.top.list insert end "$nostr $term"
+ if {![winfo exists .scan-window]} {
+ show-status {Ready} 0 1
+ set cancelFlag 0
+ return
+ }
+ set nScanTerm [$w.top.entry get]
+ if {$nScanTerm != $scanTerm} {
+ z39 callback [list scan-response $attr 0 25]
+ z39.scan numberOfTermsRequested 5
+ z39.scan preferredPositionInResponse 1
+ set scanTerm $nScanTerm
+ $w.top.list delete 0 end
+ puts "${attr} \{${scanTerm}\}"
+ if {$scanTerm == ""} {
+ z39.scan scan "${attr} 0"
+ } else {
+ z39.scan scan "${attr} \{${scanTerm}\}"
+ }
+ show-status {Scan} 1 0
+ }
+ if {$toget < 0} {
+ for {set i 0} {$i < $m} {incr i} {
+ set term [lindex [z39.scan scanLine $i] 1]
+ set nostr [format " %-6d" [lindex [z39.scan scanLine $i] 2]]
+ $w.top.list insert $i "$nostr $term"
+ }
+ } else {
+ $w.top.list delete $start end
+ for {set i 0} {$i < $m} {incr i} {
+ set term [lindex [z39.scan scanLine $i] 1]
+ set nostr [format " %-6d" [lindex [z39.scan scanLine $i] 2]]
+ $w.top.list insert end "$nostr $term"
+ }
+ }
+ if {$cancelFlag} {
+ show-status {Ready} 0 1
+ set cancelFlag 0
+ return
+ }
+ if {$toget > 0 && $m > 1 && $m < $toget} {
+ set ntoget [expr $toget - $m + 1]
+ puts ntoget=$ntoget
+ z39 callback [list scan-response $attr [expr $start + $m - 1] $ntoget]
+ set q $term
+ puts "down continue: $q"
+ if {$ntoget > 10} {
+ z39.scan numberOfTermsRequested 10
+ } else {
+ z39.scan numberOfTermsRequested $ntoget
+ }
+ z39.scan preferredPositionInResponse 1
+ puts "${attr} \{$q\}"
+ z39.scan scan "${attr} \{$q\}"
+ return
+ }
+ if {$toget < 0 && $m > 1 && $m < [expr - $toget]} {
+ set ntoget [expr - $toget - $m]
+ puts 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"
+ if {$ntoget > 10} {
+ z39.scan numberOfTermsRequested 10
+ z39.scan preferredPositionInResponse 11
+ } else {
+ z39.scan numberOfTermsRequested $ntoget
+ z39.scan preferredPositionInResponse [incr ntoget]
+ }
+ puts "${attr} \{$q\}"
+ z39.scan scan "${attr} \{$q\}"
+ return
}
show-status {Ready} 0 1
}
+proc scan-down {attr} {
+ global scanView
+
+ set w .scan-window
+ set scanView [expr $scanView + 5]
+ set s [$w.top.list size]
+ if {$scanView > $s} {
+ z39 callback [list scan-response $attr [expr $s - 1] 30]
+ set q [string range [$w.top.list get [expr $s - 1]] 8 end]
+ puts "down: $q"
+ z39.scan numberOfTermsRequested 10
+ z39.scan preferredPositionInResponse 1
+ show-status {Scan} 1 0
+ puts "${attr} \{$q\}"
+ z39.scan scan "${attr} \{$q\}"
+ return
+ }
+ $w.top.list yview $scanView
+}
+
+proc scan-up {attr} {
+ global scanView
+
+ set w .scan-window
+ if {$scanView < 5} {
+ z39 callback [list scan-response $attr 0 -30]
+ set q [string range [$w.top.list get 0] 8 end]
+ puts "up: $q"
+ z39.scan numberOfTermsRequested 10
+ z39.scan preferredPositionInResponse 11
+ show-status {Scan} 1 0
+ z39.scan scan "${attr} \{$q\}"
+ return
+ }
+ set scanView [expr $scanView - 5]
+ $w.top.list yview $scanView
+}
+
proc search-response {} {
global setNo
global setOffset
puts "In search-response"
init-title-lines
show-status {Ready} 0 1
- show-message "[z39.$setNo resultCount] hits"
set setMax [z39.$setNo resultCount]
- if {$setMax == 0} {
+ 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} {
set status [z39.$setNo responseStatus]
if {[lindex $status 0] == "NSD"} {
set code [lindex $status 1]
global setOffset
global setMax
+ puts "setOffset=$setOffset"
puts "present-more"
if {$setNo == 0} {
+ puts "setNo=$setNo"
return
}
set max [z39.$setNo resultCount]
- if {$max <= $setMax} {
+ if {$max <= $setOffset} {
+ puts "max=$max"
+ puts "setOffset=$setOffset"
return
}
if {$number == ""} {
set setMax $max
} else {
incr setMax $number
+ if {$setMax > $max} {
+ set setMax $max
+ }
}
z39 callback {present-response}
set toGet [expr $setMax - $setOffset + 1]
+ if {$toGet <= 0} {
+ return
+ }
if {$toGet > 3} {
set toGet 3
- }
+ }
z39.$setNo present $setOffset $toGet
show-status {Retrieve} 1 0
}
.data.list delete 0 end
}
+proc title-press {y setno} {
+ show-full-marc $setno [expr 1 + [.data.list nearest $y]] 0
+}
+
proc add-title-lines {setno no offset} {
+ if {$offset == 1} {
+ .data.list delete 0 end
+ }
+ bind .data.list <Double-Button-1> [list title-press %y $setno]
for {set i 0} {$i < $no} {incr i} {
set o [expr $i + $offset]
set type [z39.$setno type $o]
}
.data.list insert end "Error ${err}${add}"
} elseif {$type == ""} {
- .data.list insert end "empty"
+ break
}
}
}
global queryTypes
set i 0
- .top.query.m.slist delete 0 last
+ .top.options.m.slist delete 0 last
foreach n $queryTypes {
- .top.query.m.slist add command -label $n \
+ .top.options.m.slist add command -label $n \
-command [list query-setup $i]
incr i
}
set i 0
- .top.query.m.clist delete 0 last
+ .top.options.m.clist delete 0 last
foreach n $queryTypes {
- .top.query.m.clist add command -label $n \
+ .top.options.m.clist add command -label $n \
-command [list query-select $i]
incr i
}
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}
.top.file.m add separator
menu .top.target.m.slist
cascade-target-list
-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 {}]
-.top.search configure -state disabled
-
-menubutton .top.query -text "Query" -underline 0 -menu .top.query.m
-menu .top.query.m
-.top.query.m add cascade -label "Choose" -menu .top.query.m.clist
-.top.query.m add command -label "Define" -command {new-query-dialog}
-.top.query.m add cascade -label "Edit" -menu .top.query.m.slist
-menu .top.query.m.clist
-menu .top.query.m.slist
+menubutton .top.service -text "Service" -underline 0 -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" \
+ -command [list present-more 10]
+.top.service.m.present add command -label "All" \
+ -command [list present-more {}]
+.top.service configure -state disabled
+
+menubutton .top.rset -text "Set" -menu .top.rset.m
+menu .top.rset.m
+.top.rset.m add command -label "Load" -command {load-set}
+.top.rset.m add separator
+
+menubutton .top.options -text "Options" -underline 0 -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
+menu .top.options.m.clist
+menu .top.options.m.slist
cascade-query-list
menubutton .top.help -text "Help" -menu .top.help.m
.top.help.m add command -label "About" \
-command {tkerror "About not available. Sorry"}
-pack .top.file .top.target .top.query .top.search -side left
+pack .top.file .top.target .top.service .top.rset .top.options -side left
pack .top.help -side right
index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
button .mid.search -width 7 -text {Search} -command search-request \
-state disabled
-button .mid.scan -width 7 -text {Scan} -command scan-request \
- -state disabled
+button .mid.scan -width 7 -text {Scan} \
+ -command [list scan-request "@attr 1=4"] -state disabled
button .mid.present -width 7 -text {Present} -command [list present-more 10] \
-state disabled
pack .mid.search .mid.scan .mid.present .mid.clear -side left \
-fill y -padx 5 -pady 3
-listbox .data.list -yscrollcommand {.data.scroll set} -font fixed
+listbox .data.list -yscrollcommand {.data.scroll set} -font fixed -geometry 20x2
scrollbar .data.scroll -orient vertical -border 1
pack .data.list -side left -fill both -expand yes
pack .data.scroll -side right -fill y
pack .bot.a.status .bot.a.set .bot.a.message \
-side left -padx 2 -pady 2
-bind .data.list <Double-Button-1> {set indx [.data.list nearest %y]
-show-full-marc [incr indx] 0}
-
ir z39
show-logo 1
projects / ir-tcl-moved-to-github.git / blobdiff