X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=client.tcl;h=d2d39fc0458667b7fa18e8687ce6f764e9f8c9b4;hb=50c3477657810501ed07e9e1203ca0407e3bb58a;hp=23175bb4d8991a4e85017e7e1de53345cabde090;hpb=848616be8d6a53b195deda0f666bf89603b5139c;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index 23175bb..d2d39fc 100644
--- a/client.tcl
+++ b/client.tcl
@@ -1,6 +1,24 @@
 #
 # $Log: client.tcl,v $
-# Revision 1.5  1995-03-15 13:59:23  adam
+# 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
+# Improved target/database setup.
+#
+# Revision 1.7  1995/03/16  17:54:03  adam
+# Minor changes really.
+#
+# Revision 1.6  1995/03/15  19:10:20  adam
+# Database setup in protocol-setup (rather target setup).
+#
+# Revision 1.5  1995/03/15  13:59:23  adam
 # Minor changes.
 #
 # Revision 1.4  1995/03/14  17:32:29  adam
@@ -21,6 +39,11 @@ set hotTargets {}
 set hotInfo {}
 set busy 0
 
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {}}
+set hostid Default
+set settingsChanged 0
+set setNo 0
+
 wm minsize . 360 200
 
 if {[file readable "~/.tk-c"]} {
@@ -34,7 +57,7 @@ proc top-down-window {w} {
     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} \
@@ -43,11 +66,12 @@ proc top-down-ok-cancel {w ok-action} {
     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} {
@@ -116,9 +140,9 @@ proc show-full-marc {no} {
         pack  $w.top -side top -fill both -expand yes
         pack  $w.bot -fill both
 
-        text $w.top.record -width 60 -height 10 \
-                -yscrollcommand "$w.top.s set"
-        scrollbar $w.top.s -command "$w.top.record yview"
+        text $w.top.record -width 60 -height 10 -wrap word \
+                -yscrollcommand [list $w.top.s set]
+        scrollbar $w.top.s -command [list $w.top.record yview]
 
         set new 1
     }
@@ -185,11 +209,11 @@ proc update-target-hotlist {target} {
 
 proc set-target-hotlist {} {
     global hotTargets
-
+    
     set i 1
     foreach target $hotTargets {
-        .top.target.m add command -label $target -command \
-            "menu-open-target $target"
+        .top.target.m add command -label "$i $target" -command \
+                "menu-open-target $target {}"
         incr i
         if {$i > 8} {
              break
@@ -197,33 +221,51 @@ proc set-target-hotlist {} {
     }
 }
 
-proc menu-open-target {target} {
-    open-target $target
+proc menu-open-target {target base} {
+    open-target $target $base
     update-target-hotlist $target
 }
 
-proc open-target-action {} {
-    set host [.target-connect.top.host.entry get]
-    set port [.target-connect.top.port.entry get]
+proc define-target-action {} {
+    global profile
 
-    if {$host == ""} {
+    set target [.target-define.top.target.entry get]
+    if {$target == ""} {
         return
     }
-    if {$port == ""} {
-        set port 210
+    update-target-hotlist $target
+    foreach n [array names profile] {
+        if {$n == $target} {
+            protocol-setup $n
+            return
+        }
     }
-    open-target "${host}:${port}"
-    update-target-hotlist ${host}:${port}
-    destroy .target-connect
+    set profile($target) $profile(Default)
+    protocol-setup $target
+    destroy .target-define
 }
 
-proc open-target {target} {
+proc open-target {target base} {
+    global profile
+
+    .top.target.m disable 0
+    .top.target.m enable 1
     z39 disconnect
-    global csRadioType
-    z39 comstack ${csRadioType}
+    z39 comstack [lindex $profile($target) 6]
+    # 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]
+    if {$base == ""} {
+        z39 databaseNames [lindex [lindex $profile($target) 7] 0]
+    } else {
+        z39 databaseNames $base
+    }
     show-target $target
-    z39 connect $target
-
+    z39 connect  [lindex $profile($target) 1]:[lindex $profile($target) 2]
     init-request
 }
 
@@ -236,13 +278,13 @@ 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
 }
@@ -264,7 +306,7 @@ proc load-set {} {
             {{Filename:}} \
             {load-set-action} {destroy .load-set}
     
-    top-down-ok-cancel $w {load-set-action}
+    top-down-ok-cancel $w {load-set-action} 1
 }
 
 proc init-request {} {
@@ -299,13 +341,23 @@ proc search-response {} {
     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 > 30} {
-        set setMax 30
+    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 > 10} {
+        set setMax 10
     }
     z39 callback {present-response}
     set setOffset 1
@@ -313,14 +365,17 @@ proc search-response {} {
     show-status {Retrieve} 1
 }
 
-proc add-title-lines {no offset} {
-    global setNo
+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]
-        .data.list insert end "$title - $year"
+        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"
     }
 }
 
@@ -332,25 +387,52 @@ proc present-response {} {
     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
     }
 }
 
+proc left-cursor {w} {
+    set i [$w index insert]
+    if {$i > 0} {
+        incr i -1
+        $w icursor $i
+    }
+}
+
+proc right-cursor {w} {
+    set i [$w index insert]
+    incr i
+    $w icursor $i
+}
+
 proc bind-fields {list returnAction escapeAction} {
     set max [expr [llength $list]-1]
     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]]
     }
     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]]
     focus [lindex $list 0]
 }
 
@@ -361,7 +443,7 @@ proc entry-fields {parent list tlist returnAction escapeAction} {
         set label ${parent}.${field}.label
         set entry ${parent}.${field}.entry
         label $label -text [lindex $tlist $i] -anchor e
-        entry $entry -width 30 -relief sunken
+        entry $entry -width 32 -relief sunken
         pack $label -side left
         pack $entry -side right
         lappend alist $entry
@@ -370,8 +452,8 @@ proc entry-fields {parent list tlist returnAction escapeAction} {
     bind-fields $alist $returnAction $escapeAction
 }
 
-proc open-target-dialog {} {
-    set w .target-connect
+proc define-target-dialog {} {
+    set w .target-define
 
     toplevel $w
 
@@ -379,17 +461,16 @@ proc open-target-dialog {} {
 
     top-down-window $w
 
-    frame $w.top.host
-    frame $w.top.port
+    frame $w.top.target
 
-    pack $w.top.host $w.top.port \
+    pack $w.top.target \
             -side top -anchor e -pady 2 
 
-    entry-fields $w.top {host port } \
-            {{Hostname:} {Port number:}} \
-            {open-target-action} {destroy .target-connect}
-
-    top-down-ok-cancel $w {open-target-action}
+    entry-fields $w.top {target} \
+            {{Target:}} \
+            {define-target-action} {destroy .target-define}
+    
+    top-down-ok-cancel $w {define-target-action} 1
 }
 
 proc close-target {} {
@@ -398,10 +479,37 @@ proc close-target {} {
     show-target {None}
     show-status {Not connected} 0
     show-message {}
+    .top.target.m disable 1
+    .top.target.m enable 0
 }
 
-proc protocol-setup-action {} {
-    destroy .protocol-setup
+proc protocol-setup-action {target} {
+    global profile
+    global csRadioType
+    global settingsChanged
+
+    set w .setup-${target}.top
+
+    #set w .protocol-setup.top
+    
+    set b {}
+    set settingsChanged 1
+    set len [$w.databases.list size]
+    for {set i 0} {$i < $len} {incr i} {
+        lappend b [$w.databases.list get $i]
+    }
+    set profile($target) [list [$w.description.entry get] \
+            [$w.host.entry get] \
+            [$w.port.entry get] \
+            [$w.idAuthentication.entry get] \
+            [$w.maximumRecordSize.entry get] \
+            [$w.preferredMessageSize.entry get] \
+            $csRadioType \
+            $b]
+
+    cascade-target-list
+    puts $profile($target)
+    destroy .setup-${target}
 }
 
 
@@ -416,39 +524,125 @@ proc place-force {window parent} {
     wm geometry $window +${x}+${y}
 }
 
-proc protocol-setup {} {
-    set w .protocol-setup
 
+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 {target} {
+    set w .database-select
+
+    set oldFocus [focus]
     toplevel $w
 
+    place-force $w .setup-${target}
+
+    top-down-window $w
+
+    frame $w.top.database
+
+    pack $w.top.database -side top -anchor e -pady 2
+    
+    entry-fields $w.top {database} \
+            {{Database to add:}} \
+            [list add-database-action $target] {destroy .database-select}
+
+    top-down-ok-cancel $w [list add-database-action $target] 1
+    focus $oldFocus
+}
+
+proc delete-database {target} {
+    set w .setup-${target}
+    
+    foreach i [lsort -decreasing \
+            [$w.top.databases.list curselection]] {
+        $w.top.databases.list delete $i
+    }
+}
+
+proc protocol-setup {target} {
+    set w .setup-$target
+
+    global profile
+    global csRadioType
+
+    toplevel $w
+
+    wm title $w "Setup $target"
     place-force $w .
 
     top-down-window $w
     
+    if {$target == ""} {
+        set target Default
+    }
+    puts target
+    puts $profile($target)
+
+    frame $w.top.host
+    frame $w.top.port
     frame $w.top.description
-    frame $w.top.idAuthentification
-    frame $w.top.maximumMessageSize
+    frame $w.top.idAuthentication
+    frame $w.top.maximumRecordSize
     frame $w.top.preferredMessageSize
     frame $w.top.cs-type -relief ridge -border 2
     frame $w.top.query -relief ridge -border 2
-    
+    frame $w.top.databases -relief ridge -border 2
+
     # Maximum/preferred/idAuth ...
-    pack $w.top.description \
-            $w.top.idAuthentification $w.top.maximumMessageSize \
-            $w.top.preferredMessageSize -side top -anchor e -pady 2 
+    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 idAuthentification maximumMessageSize \
-            preferredMessageSize} \
-            {{Description:} {Id Authentification:} {Maximum Message Size:}
-    {Preferred Message Size:}} \
-            {protocol-setup-action} {destroy .protocol-setup}
+    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] [list destroy $w]
     
-    # Transport ...
-    pack $w.top.cs-type -side left -pady 2 -padx 2
+    $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]
+
+    # 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 $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
+    pack $w.top.databases.label -side top -fill x \
+            -padx 2 -pady 2
+    pack $w.top.databases.add $w.top.databases.delete -side top -fill x \
+            -padx 2 -pady 2
+    pack $w.top.databases.list -side left -fill both -expand yes \
+            -padx 2 -pady 2
+    pack $w.top.databases.scroll -side right -fill y \
+            -padx 2 -pady 2
+    $w.top.databases.scroll config -command "$w.top.databases.list yview"
+
+    foreach b [lindex $profile($target) 7] {
+        $w.top.databases.list insert end $b
+    }
     
-    global csRadioType
+    # Transport ...
+    set csRadioType [lindex $profile($target) 6]
+
+    pack $w.top.cs-type -pady 6 -padx 6 -side top
     
-    label $w.top.cs-type.label -text "Transport" -anchor e
+    label $w.top.cs-type.label -text "Transport" 
     radiobutton $w.top.cs-type.tcpip -text "TCP/IP" \
             -command {puts tcp/ip} -variable csRadioType -value tcpip
     radiobutton $w.top.cs-type.mosi -text "MOSI" \
@@ -456,29 +650,42 @@ proc protocol-setup {} {
     
     pack $w.top.cs-type.label $w.top.cs-type.tcpip $w.top.cs-type.mosi \
             -padx 4 -side top -fill x
-    
+
     # Query ...
-    pack $w.top.query -side right -pady 2 -padx 2 -expand yes
+    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"
 
-    pack $w.top.query.label -side top -anchor w
+    pack $w.top.query.label -side top 
     pack $w.top.query.c1 $w.top.query.c2 $w.top.query.c3 \
-            -padx 4 -side left -fill x
-    
-    top-down-ok-cancel $w {protocol-setup-action}
+            -padx 4 -side top -fill x
+
+    foreach sub [winfo children $w.top] {
+        puts $sub
+        bind $sub <Control-a> "add-database $target"
+    }
+    top-down-ok-cancel $w [list protocol-setup-action $target] 0
 }
 
 proc database-select-action {} {
-    z39 databaseNames [.database-select.top.database.entry get]
+    set w .database-select.top
+    set b {}
+    foreach indx [$w.databases.list curselection] {
+        lappend b [$w.databases.list get $indx]
+    }
+    if {$b != ""} {
+        z39 databaseNames $b
+    }
     destroy .database-select
 }
 
 proc database-select {} {
     set w .database-select
+    global profile
+    global hostid
 
     toplevel $w
 
@@ -486,30 +693,124 @@ proc database-select {} {
 
     top-down-window $w
 
-    frame $w.top.database
+    if {$hostid == ""} {
+        set hostid Default
+    }
 
-    pack $w.top.database -side top -anchor e -pady 2
-    
-    entry-fields $w.top {database} \
-            {{Database:}} \
-            {database-select-action} {destroy .database-select}
+    frame $w.top.databases -relief ridge -border 2
+
+    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 \
+            -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
+    pack $w.top.databases.list -side left -fill both -expand yes \
+            -padx 2 -pady 2
+    pack $w.top.databases.scroll -side right -fill y \
+            -padx 2 -pady 2
+    $w.top.databases.scroll config -command "$w.top.databases.list yview"
+
+    foreach b [lindex $profile($hostid) 7] {
+        $w.top.databases.list insert end $b
+    }
+    top-down-ok-cancel $w {database-select-action} 1
+}
 
-    top-down-ok-cancel $w {database-select-action}
+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] {
+        if {$n != "Default"} {
+            set nl [string tolower $n]
+            if {[llength [lindex $profile($n) 7]] > 1} {
+                .top.target.m.clist add cascade -label $n \
+                        -menu .top.target.m.clist.$nl
+                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"
+                }
+            } else {
+                .top.target.m.clist add command -label $n \
+                        -command "menu-open-target $n {}"
+            }
+        }
+    }
+    .top.target.m.slist delete 0 last
+    foreach n [array names profile] {
+        if {$n != "Default"} {
+            .top.target.m.slist add command -label $n \
+                    -command "protocol-setup $n"
+        }
+    }
 }
 
 proc save-settings {} {
     global hotTargets 
+    global profile
+    global settingsChanged
 
     set f [open "~/.tk-c" w]
     puts $f "# Setup file"
     puts $f "set hotTargets \{ $hotTargets \}"
+
+    foreach n [array names profile] {
+        puts -nonewline $f "set profile($n) \{"
+        puts -nonewline $f $profile($n)
+        puts $f "\}"
+    }
     close $f
+    set settingsChanged 0
+}
+
+proc alert {ask} {
+    set w .alert
+
+    global alertAnswer
+
+    toplevel $w
+    place-force $w .
+    top-down-window $w
+
+    message $w.top.message -text $ask
+
+    pack $w.top.message -side left -pady 6 -padx 20 -expand yes -fill x
+  
+    set alertAnswer 0
+    top-down-ok-cancel $w {alert-action} 1
+    return $alertAnswer
+}
+
+proc alert-action {} {
+    global alertAnswer
+    set alertAnswer 1
+    destroy .alert
+}
+
+proc exit-action {} {
+    global settingsChanged
+
+    if {$settingsChanged} {
+        set a [alert "you havent saved your settings. Do you wish to save?"]
+        if {$a} {
+            save-settings
+        }
+    }
+    destroy .
 }
 
-frame .top -border 1 -relief raised
+frame .top  -border 1 -relief raised
 frame .mid  -border 1 -relief raised
 frame .data -border 1 -relief raised
-frame .bot -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
@@ -519,17 +820,24 @@ 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 {destroy .}
+.top.file.m add command -label "Exit" -command {exit-action}
 
 menubutton .top.target -text "Target" -menu .top.target.m
 menu .top.target.m
-.top.target.m add command -label "Connect" -command {open-target-dialog}
+.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 command -label "Initialize" -command {init-request}
-.top.target.m add command -label "Setup" -command {protocol-setup}
+#.top.target.m add command -label "Initialize" -command {init-request}
+.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
 
+.top.target.m disable 1
+
+menu .top.target.m.clist
+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}
@@ -537,6 +845,7 @@ menu .top.database.m
 
 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"}
 
@@ -544,10 +853,12 @@ pack .top.file .top.target .top.database -side left
 pack .top.help -side right
 
 label .mid.searchlabel -text {Search:}
-entry .mid.searchentry -width 50 -relief sunken
+entry .mid.searchentry -width 40 -relief sunken
+
+bind .mid.searchentry <Left> {left-cursor .mid.searchentry}
+bind .mid.searchentry <Right> {right-cursor .mid.searchentry}
 
 listbox .data.list -yscrollcommand {.data.scroll set}
-#-geometry 50x10
 scrollbar .data.scroll -orient vertical -border 1
 pack .data.list -side left -fill both -expand yes
 pack .data.scroll -side right -fill y
@@ -563,8 +874,4 @@ pack .bot.target .bot.status .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}
 
-set setNo 0
 ir z39
-z39 comstack tcpip
-set csRadioType [z39 comstack]
-z39 preferredMessageSize 12000