#
# $Log: client.tcl,v $
-# Revision 1.15 1995-03-28 12:45:22 adam
+# Revision 1.22 1995-05-26 11:44:09 adam
+# Bugs fixed. More work on MARC utilities and queries. Test
+# client is up-to-date again.
+#
+# Revision 1.21 1995/05/11 15:34:46 adam
+# Scan request changed a bit. This version works with RLG.
+#
+# Revision 1.20 1995/04/21 16:31:57 adam
+# New radiobutton: protocol (z39v2/SR).
+#
+# Revision 1.19 1995/04/18 16:11:50 adam
+# First version of graphical Scan. Some work on query-by-form.
+#
+# Revision 1.18 1995/04/10 10:50:22 adam
+# Result-set name defaults to suffix of ir-set name.
+# Started working on scan. Not finished at this point.
+#
+# Revision 1.17 1995/03/31 09:34:57 adam
+# Search-button disabled when there is no connection.
+#
+# 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.
set hotInfo {}
set busy 0
-set profile(Default) {{} {} {210} {} 16384 8192 tcpip {}}
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
set hostid Default
set settingsChanged 0
set setNo 0
-wm minsize . 300 200
+set queryTypes {Simple}
+set queryButtons { { {I 0} {I 1} {I 2} } }
+set queryInfo { { {Title {1=4 4=1 6=1}} {Author {1=1 4=1 6=1}} \
+ {Subject {1=21 4=1 6=1}} {Any {1=1016 4=1 6=1}} } }
+
+wm minsize . 350 250
if {[file readable "~/.tk-c"]} {
source "~/.tk-c"
}
+set queryButtonsFind [lindex $queryButtons 0]
+set queryInfoFind [lindex $queryInfo 0]
+
proc top-down-window {w} {
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
}
proc top-down-ok-cancel {w ok-action g} {
}
}
+proc top-down-ok-cancelx {w buttonList g} {
+ set i 0
+ set l [llength $buttonList]
+
+ frame $w.bot.$i -relief sunken -border 1
+ pack $w.bot.$i -side left -expand yes -padx 5 -pady 5
+ button $w.bot.$i.ok -text [lindex $buttonList $i] \
+ -command [lindex $buttonList [expr $i+1]]
+ pack $w.bot.$i.ok -expand yes -padx 3 -pady 3 -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 -padx 3 -pady 3 -side left
+ incr i 2
+ }
+ button $w.bot.cancel -width 6 -text {Cancel} \
+ -command "destroy $w"
+ pack $w.bot.cancel -side left -expand yes
+
+ if {$g} {
+ # Grab ...
+ grab $w
+ tkwait window $w
+ }
+}
+
proc show-target {target} {
.bot.target configure -text "$target"
}
}
incr no
- set r [z39.$setNo recordMarc $no line * * *]
+ set r [z39.$setNo getMarc $no list * * *]
$w.top.record tag configure marc-tag -foreground blue
$w.top.record tag configure marc-data -foreground black
set i 1
foreach target $hotTargets {
.top.target.m add command -label "$i $target" -command \
- "menu-open-target $target {}"
+ "reopen-target $target {}"
incr i
if {$i > 8} {
break
}
}
-proc menu-open-target {target base} {
+proc reopen-target {target base} {
+ close-target
open-target $target $base
update-target-hotlist $target
}
z39 disconnect
z39 comstack [lindex $profile($target) 6]
- # z39 idAuthentication [lindex $profile($target) 3]
+ z39 idAuthentication [lindex $profile($target) 3]
z39 maximumRecordSize [lindex $profile($target) 4]
z39 preferredMessageSize [lindex $profile($target) 5]
puts -nonewline "maximumRecordSize="
show-message {}
.top.target.m disable 1
.top.target.m enable 0
+ .top.search configure -state disabled
+ .mid.search configure -state disabled
+ .mid.scan configure -state disabled
}
proc load-set-action {} {
global setNo
incr setNo
- ir-set z39.$setNo
+ ir-set z39.$setNo z39
set fname [.load-set.top.filename.entry get]
destroy .load-set
z39 callback {init-response}
z39 init
show-status {Initializing} 1
- set setNo 0
}
proc init-response {} {
show-status {Ready} 0
- bind .mid.searchentry <Return> search-request
- focus .mid.searchentry
+ .top.search configure -state normal
+ .mid.search configure -state normal
+ .mid.scan configure -state normal
+ if {![z39 initResult]} {
+ set u [z39 userInformationField]
+ close-target
+ tkerror "Connection rejected by target: $u"
+ }
}
proc search-request {} {
set target $hostid
+ set query [index-query]
+ if {$query==""} {
+ return
+ }
incr setNo
- ir-set z39.$setNo
+ ir-set z39.$setNo z39
- if {[lindex $profile($target) 10]} {
+ if {[lindex $profile($target) 10] == 1} {
z39.$setNo setName $setNo
+ puts "setName=${setNo}"
+ } else {
+ z39.$setNo setName Default
+ puts "setName=Default"
}
- if {[lindex $profile($target) 8]} {
- z39 query rpn
+ if {[lindex $profile($target) 8] == 1} {
+ z39.$setNo queryType rpn
}
- if {[lindex $profile($target) 9]} {
- z39 query ccl
+ if {[lindex $profile($target) 9] == 1} {
+ z39.$setNo queryType ccl
}
z39 callback {search-response}
- z39.$setNo search [.mid.searchentry get]
+ z39.$setNo search $query
show-status {Search} 1
}
+proc scan-request {} {
+ set w .scan-window
+
+ global profile
+ global hostid
+
+ set target $hostid
+
+ ir-scan z39.scan
+
+ z39 callback {scan-response}
+ if {![winfo exists $w]} {
+ toplevel $w
+
+ wm title $w "Scan"
+
+ wm minsize $w 200 200
+
+ top-down-window $w
+
+ 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]
+
+ top-down-ok-cancelx $w [list {Close} [list destroy $w]] 0
+ }
+ z39.scan numberOfTermsRequested 100
+ z39.scan scan "@attr 1=4 0"
+
+ show-status {Scan} 1
+}
+
+proc scan-response {} {
+ set w .scan-window
+ 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]]
+
+ $w.top.list insert end "$nostr $term"
+ }
+ show-status {Ready} 0
+}
+
proc search-response {} {
global setNo
global setOffset
}
return
}
- if {$setMax > 10} {
- set setMax 10
+ 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 present-more {number} {
+ global setNo
+ global setOffset
+ global setMax
+
+ puts "present-more"
+ if {$setNo == 0} {
+ return
+ }
+ 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 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 nostr [format "%3d" $o]
+ set title [lindex [z39.$setno getMarc $o field 245 * a] 0]
+ set year [lindex [z39.$setno getMarc $o field 260 * c] 0]
+ set nostr [format "%5d" $o]
.data.list insert end "$nostr $title - $year"
}
}
set w .target-define
toplevel $w
-
place-force $w .
-
top-down-window $w
-
frame $w.top.target
-
pack $w.top.target \
-side top -anchor e -pady 2
-
entry-fields $w.top {target} \
{{Target:}} \
{define-target-action} {destroy .target-define}
-
top-down-ok-cancel $w {define-target-action} 1
}
proc protocol-setup-action {target} {
global profile
global csRadioType
+ global protocolRadioType
global settingsChanged
global RPNCheck
global CCLCheck
$b \
$RPNCheck \
$CCLCheck \
- $ResultSetCheck ]
+ $ResultSetCheck \
+ $protocolRadioType ]
cascade-target-list
puts $profile($target)
destroy .setup-${target}
}
-
proc place-force {window parent} {
set g [wm geometry $parent]
wm geometry $window +${x}+${y}
}
-
proc add-database-action {target} {
set w .setup-${target}
global profile
global csRadioType
+ global protocolRadioType
global RPNCheck
global CCLCheck
global ResultSetCheck
frame $w.top.maximumRecordSize
frame $w.top.preferredMessageSize
frame $w.top.cs-type -relief ridge -border 2
+ frame $w.top.protocol -relief ridge -border 2
frame $w.top.query -relief ridge -border 2
frame $w.top.databases -relief ridge -border 2
entry-fields $w.top {description host port idAuthentication \
maximumRecordSize preferredMessageSize} \
- {{Description:} {Host:} {Port:} {Id Authentification:} \
+ {{Description:} {Host:} {Port:} {Id Authentication:} \
{Maximum Record Size:} {Preferred Message Size:}} \
[list protocol-setup-action $target] [list destroy $w]
set RPNCheck [lindex $profile($target) 8]
set CCLCheck [lindex $profile($target) 9]
set ResultSetCheck [lindex $profile($target) 10]
+ set protocolRadioType [lindex $profile($target) 11]
+ if {$protocolRadioType == ""} {
+ set protocolRadioType z39v2
+ }
# Databases ....
- pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
+ pack $w.top.databases -side left -pady 6 -padx 6 -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
+ pack $w.top.cs-type -pady 6 -padx 6 -side top -fill x
label $w.top.cs-type.label -text "Transport"
- radiobutton $w.top.cs-type.tcpip -text "TCP/IP" \
+ radiobutton $w.top.cs-type.tcpip -text "TCP/IP" -anchor w \
-command {puts tcp/ip} -variable csRadioType -value tcpip
- radiobutton $w.top.cs-type.mosi -text "MOSI" \
+ radiobutton $w.top.cs-type.mosi -text "MOSI" -anchor w\
-command {puts 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
+
+ label $w.top.protocol.label -text "Protocol"
+ radiobutton $w.top.protocol.z39v2 -text "Z39.50" -anchor w \
+ -command {puts z39v2} -variable protocolRadioType -value z39v2
+ radiobutton $w.top.protocol.sr -text "SR" -anchor w \
+ -command {puts 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
+ pack $w.top.query -pady 6 -padx 6 -side top -fill x
- label $w.top.query.label -text "Query support" -anchor e
- 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
+ label $w.top.query.label -text "Query support"
+ checkbutton $w.top.query.c1 -text "RPN query" -anchor w -variable RPNCheck
+ checkbutton $w.top.query.c2 -text "CCL query" -anchor w -variable CCLCheck
+ checkbutton $w.top.query.c3 -text "Result sets" -anchor w -variable ResultSetCheck
pack $w.top.query.label -side top
pack $w.top.query.c1 $w.top.query.c2 $w.top.query.c3 \
menu .top.target.m.clist.$nl
foreach b [lindex $profile($n) 7] {
.top.target.m.clist.$nl add command -label $b \
- -command "menu-open-target $n $b"
+ -command "reopen-target $n $b"
}
} else {
.top.target.m.clist add command -label $n \
- -command "menu-open-target $n {}"
+ -command "reopen-target $n {}"
}
}
}
}
}
+proc cascade-query-list {} {
+ global queryTypes
+
+ set i 0
+ .top.query.m.slist delete 0 last
+ foreach n $queryTypes {
+ .top.query.m.slist add command -label $n \
+ -command [list query-setup $i]
+ incr i
+ }
+
+ set i 0
+ .top.query.m.clist delete 0 last
+ foreach n $queryTypes {
+ .top.query.m.clist add command -label $n \
+ -command [list query-select $i]
+ incr i
+ }
+}
+
proc save-settings {} {
global hotTargets
global profile
global settingsChanged
+ global queryTypes
+ global queryButtons
+ global queryInfo
set f [open "~/.tk-c" w]
puts $f "# Setup file"
puts -nonewline $f $profile($n)
puts $f "\}"
}
+ puts -nonewline $f "set queryTypes \{"
+ puts -nonewline $f $queryTypes
+ puts $f "\}"
+
+ puts -nonewline $f "set queryButtons \{"
+ puts -nonewline $f $queryButtons
+ puts $f "\}"
+
+ puts -nonewline $f "set queryInfo \{"
+ puts -nonewline $f $queryInfo
+ puts $f "\}"
+
close $f
set settingsChanged 0
}
destroy .
}
+proc listbuttonaction {w name h user i} {
+ $w configure -text [lindex $name 0]
+ $h [lindex $name 1] $user $i
+}
+
+proc listbuttonx {button no names handle user} {
+ if {[winfo exists $button]} {
+ $button configure -text [lindex [lindex $names $no] 0]
+ ${button}.m delete 0 last
+ } else {
+ menubutton $button -text [lindex [lindex $names $no] 0] \
+ -width 10 -menu ${button}.m -relief raised -border 1
+ menu ${button}.m
+ }
+ set i 0
+ foreach name $names {
+ ${button}.m add command -label [lindex $name 0] \
+ -command [list listbuttonaction ${button} $name \
+ $handle $user $i]
+ incr i
+ }
+}
+
+proc listbutton {button no names} {
+ menubutton $button -text [lindex $names $no] -width 10 -menu ${button}.m \
+ -relief raised -border 1
+ menu ${button}.m
+ foreach name $names {
+ ${button}.m add command -label $name \
+ -command [list ${button} configure -text $name]
+ }
+}
+
+proc query-add-index-action {queryNo} {
+ set w .setup-query-$queryNo
+
+ global queryInfoTmp
+ global queryButtonsTmp
+
+ lappend queryInfoTmp [list [.query-add-index.top.index.entry get] {}]
+
+ destroy .query-add-index
+ #destroy $w.top.lines
+ #frame $w.top.lines -relief ridge -border 2
+ index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+ #pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+}
+
+proc query-add-line {queryNo} {
+ set w .setup-query-$queryNo
+
+ global queryInfoTmp
+ global queryButtonsTmp
+
+ lappend queryButtonsTmp {I 0}
+
+ #destroy $w.top.lines
+ #frame $w.top.lines -relief ridge -border 2
+ index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+ #pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+}
+
+proc query-del-line {queryNo} {
+ set w .setup-query-$queryNo
+
+ global queryInfoTmp
+ global queryButtonsTmp
+
+ set l [llength $queryButtonsTmp]
+ if {$l <= 0} {
+ return
+ }
+ incr l -1
+ set queryButtonsTmp [lreplace $queryButtonsTmp $l $l]
+ index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+}
+
+proc query-add-index {queryNo} {
+ set w .query-add-index
+
+ toplevel $w
+ place-force $w .setup-query-$queryNo
+ 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}
+ top-down-ok-cancel $w [list query-add-index-action $queryNo] 1
+}
+
+proc query-setup-action {queryNo} {
+ global queryButtons
+ global queryInfo
+ global queryButtonsTmp
+ global queryInfoTmp
+ global queryButtonsFind
+ global queryInfoFind
+
+ set queryInfo [lreplace $queryInfo $queryNo $queryNo \
+ $queryInfoTmp]
+ set queryButtons [lreplace $queryButtons $queryNo $queryNo \
+ $queryButtonsTmp]
+ set queryInfoFind $queryInfoTmp
+ set queryButtonsFind $queryButtonsTmp
+
+ puts $queryInfo
+ puts $queryButtons
+ destroy .setup-query-$queryNo
+
+ index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
+}
+
+proc activate-e-index {value no i} {
+ global queryButtonsTmp
+
+ puts $queryButtonsTmp
+ set queryButtonsTmp [lreplace $queryButtonsTmp $no $no [list I $i]]
+ puts $queryButtonsTmp
+ puts "value $value"
+ puts "no $no"
+ puts "i $i"
+}
+
+proc activate-index {value no i} {
+ global queryButtonsFind
+
+ set queryButtonsFind [lreplace $queryButtonsFind $no $no [list I $i]]
+
+ puts "queryButtonsFind $queryButtonsFind"
+ puts "value $value"
+ puts "no $no"
+ puts "i $i"
+}
+
+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]
+
+ #set queryButtons { {I 0 I 1 I 2} }
+ #set queryInfo { { {Title ti} {Author au} {Subject sh} } }
+
+ toplevel $w
+
+ wm title $w "Query setup $queryName"
+ place-force $w .
+
+ 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.structure -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
+
+ # 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"
+ scrollbar $w.top.use.scroll -orient vertical -border 1
+ pack $w.top.use.label -side top -fill x \
+ -padx 2 -pady 2
+ pack $w.top.use.list -side left -fill both -expand yes \
+ -padx 2 -pady 2
+ pack $w.top.use.scroll -side right -fill y \
+ -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
+ }
+ # Relation Attributes
+ 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
+
+ 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
+
+ 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
+ top-down-ok-cancelx $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]] 0
+}
+
+proc index-clear {} {
+ global queryButtonsFind
+
+ set i 0
+ foreach b $queryButtonsFind {
+ .lines.$i.e delete 0 end
+ incr i
+ }
+}
+
+proc index-query {} {
+ global queryButtonsFind
+ global queryInfoFind
+
+ set i 0
+ set qs {}
+
+ foreach b $queryButtonsFind {
+ set term [string trim [.lines.$i.e get]]
+ if {$term != ""} {
+ set attr [lindex [lindex $queryInfoFind [lindex $b 1]] 1]
+
+ set term "\{${term}\}"
+ foreach a $attr {
+ set term "@attr $a ${term}"
+ }
+ if {$qs != ""} {
+ set qs "@and ${qs} ${term}"
+ } else {
+ set qs $term
+ }
+ }
+ incr i
+ }
+ puts "qs= $qs"
+ return $qs
+}
+
+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
+ }
+ 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 <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
+ }
+ } else {
+ pack $w.$i.l -side left
+ pack $w.$i -side top -fill x -padx 2 -pady 2
+ }
+ incr i
+ }
+ set j $i
+ while {[winfo exists $w.$j]} {
+ destroy $w.$j
+ incr j
+ }
+ 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 {$i >= 0} {
+ bind $w.$i.e <Tab> "focus $w.0.e"
+ focus $w.0.e
+ }
+}
+
+proc search-fields {w buttondefs} {
+ set i 0
+ foreach buttondef $buttondefs {
+ frame $w.$i -background white
+
+ listbutton $w.$i.l 0 $buttondef
+ entry $w.$i.e -width 32 -relief sunken
+
+ 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]
+
+ incr i
+ }
+ set j 0
+ incr i -1
+ while {$j < $i} {
+ set k [expr $j+1]
+ bind $w.$j.e <Tab> "focus $w.$k.e \n
+ $w.$k configure -background red \n
+ $w.$j configure -background white"
+ set j $k
+ }
+ bind $w.$i.e <Tab> "focus $w.0.e \n
+ $w.0 configure -background red \n
+ $w.$i configure -background white"
+ focus $w.0.e
+ $w.0 configure -background red
+}
+
frame .top -border 1 -relief raised
+frame .lines -border 1 -relief raised
frame .mid -border 1 -relief raised
frame .data -border 1 -relief raised
frame .bot -border 1 -relief raised
-pack .top .mid -side top -fill x
-pack .data -side top -fill both -expand yes
-pack .bot -fill x
+pack .top .lines .mid -side top -fill x
+pack .data -side top -fill both -expand yes
+pack .bot -fill x
menubutton .top.file -text "File" -underline 0 -menu .top.file.m
menu .top.file.m
menu .top.target.m.slist
cascade-target-list
-menubutton .top.database -text "Database" -underline 0 -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 {}]
+.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
+cascade-query-list
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.query .top.search -side left
pack .top.help -side right
-label .mid.searchlabel -text {Search:}
-entry .mid.searchentry -width 32 -relief sunken
-pack .mid.searchlabel -side left
-pack .mid.searchentry -side left -fill x -expand yes
+index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
-focus .mid.searchentry
-bind .mid.searchentry <Left> {left-cursor .mid.searchentry}
-bind .mid.searchentry <Right> {right-cursor .mid.searchentry}
+button .mid.search -width 6 -text {Search} -command search-request \
+ -state disabled
+button .mid.scan -width 6 -text {Scan} -command scan-request \
+ -state disabled
+button .mid.clear -width 6 -text {Clear} -command index-clear
+pack .mid.search .mid.scan .mid.clear -side left -padx 5 -pady 3
-listbox .data.list -yscrollcommand {.data.scroll set}
+listbox .data.list -yscrollcommand {.data.scroll set} -font fixed
scrollbar .data.scroll -orient vertical -border 1
pack .data.list -side left -fill both -expand yes
pack .data.scroll -side right -fill y