X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client.tcl;h=0418f81a8286f04ed312de0c928137fe0b9b9932;hb=1e02eadba759fcb7cbcc2ff93c604b9dc98ca91e;hp=e8de55a107c415545cea87223cdcedbe76c2a715;hpb=30673efca0f3f422cc2e7ee027e6e63f656990ba;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index e8de55a..0418f81 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,69 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.36  1995-06-13 07:42:14  adam
+# Revision 1.52  1995-06-22 13:14:59  adam
+# Feature: SUTRS. Setting getSutrs implemented.
+# Work on display formats.
+# Preferred record syntax can be set by the user.
+#
+# Revision 1.51  1995/06/21  11:11:00  adam
+# Bug fix: libdir undefined in about-origin.
+#
+# Revision 1.50  1995/06/21  11:04:48  adam
+# Uses GNU autoconf 2.3.
+# Install procedure implemented.
+# boook bitmaps moved to sub directory bitmaps.
+#
+# Revision 1.49  1995/06/20  14:16:42  adam
+# More work on cancel mechanism.
+#
+# Revision 1.48  1995/06/20  08:07:23  adam
+# New setting: failInfo.
+# Working on better cancel mechanism.
+#
+# Revision 1.47  1995/06/19  14:05:29  adam
+# Bug fix: asked for SUTRS.
+#
+# 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.
+#
+# Revision 1.36  1995/06/13  07:42:14  adam
 # Bindings removed from text widgets.
 #
 # Revision 1.35  1995/06/12  15:17:31  adam
@@ -122,48 +184,84 @@
 # First presentRequest attempts. Hot-target list.
 #
 #
+
+set libdir LIBDIR
+if {[file readable clientrc.tcl]} {
+	set libdir .
+}
 set hotTargets {}
 set hotInfo {}
 set busy 0
 
-set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
+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 recordSyntax USMARC
+set delayRequest {}
 
 set queryTypes {Simple}
 set queryButtons { { {I 0} {I 1} {I 2} } }
-set queryInfo { { {Title {1=4}} {Author {1=1}} \
+set queryInfo { { {Title {1=4 4=1}} {Author {1=1}} \
         {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]
+    global libdir
+    set formats [glob -nocomplain ${libdir}/formats/*.tcl]
     foreach f $formats {
-        source $f
-        set l [expr [string length $f] - 5]
- 	lappend displayFormats [string range $f 8 $l]
+	if {[file readable $f]} {
+            source $f
+            set l [string length $f]
+            set f [string range $f [string length "${libdir}/formats/"] \
+                    [expr $l - 5]]
+            lappend displayFormats $f
+        }
     }
 }
 
+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
     }
-    add-title-lines 0 10000 1
+    if {!$busy} {
+        .bot.a.status configure -text "Reformatting"
+    }
+    update idletasks
+    add-title-lines -1 10000 1
+    if {!$busy} {
+        .bot.a.status configure -text "Ready"
+    }
 }
 
-proc readonlyText {w} {
+proc initBindings {} {
     set w Text
     bind $w <1> {}
     bind $w <Double-1> {}
@@ -180,14 +278,26 @@ proc readonlyText {w} {
     bind $w <Control-h> {}
     bind $w <Control-d> {}
     bind $w <Control-v> {}
+
+    set w Listbox
+    bind $w <B1-Motion> {}
+    bind $w <Shift-B1-Motion> {}
+
+    set w Entry
 }
 
-proc destroyG {w} {
-    global windowGeometry
-    set windowGeometry($w) [wm geometry $w]
-    destroy $w
+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} {
+    global windowGeometry
+    set windowGeometry($w) [wm geometry $w]
+}    
 proc toplevelG {w} {
     global windowGeometry
 
@@ -198,14 +308,15 @@ proc toplevelG {w} {
             wm geometry $w $g
         }
     }
+    bind $w <Destroy> [list destroyGW $w]
 }
 
-if {[file readable "clientrc.tcl"]} {
-    source "clientrc.tcl"
+if {[file readable "${libdir}/clientrc.tcl"]} {
+    source "${libdir}/clientrc.tcl"
 }
 
-if {[file readable "clientg.tcl"]} {
-    source "clientg.tcl"
+if {[file readable "~/.clientrc.tcl"]} {
+    source "~/.clientrc.tcl"
 }
 
 set queryButtonsFind [lindex $queryButtons 0]
@@ -243,7 +354,7 @@ proc bottom-buttons {w buttonList g} {
     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 -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
+    pack $w.bot.$i.ok -expand yes -ipadx 3 -ipady 2 -padx 3 -pady 3 -side left
 
     incr i 2
     while {$i < $l} {
@@ -262,30 +373,44 @@ proc bottom-buttons {w buttonList g} {
 proc cancel-operation {} {
     global cancelFlag
     global busy
+    global delayRequest
 
-    set cancelFlag 1
     if {$busy} {
-        show-status Cancelled 0 {}
+        set cancelFlag 1
+        set delayRequest {}
+        show-status Cancel 0 1
     }
 }
 
-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
+    global libdir
+
     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}
+        .bot.logo configure -bitmap @${libdir}/bitmaps/book${v1}
         after 140 [list show-logo $v1]
         return
     }
     while {1} {
-        .bot.logo configure -bitmap @book1
+        .bot.logo configure -bitmap @${libdir}/bitmaps/book1
         tkwait variable busy
         if {$busy} {
             show-logo 1
@@ -296,7 +421,10 @@ proc 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} {
@@ -310,13 +438,21 @@ proc show-status {status b sb} {
     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
         }
-        set searchEnable 1
     } else {
         .top.service configure -state disabled
         .mid.search configure -state disabled
@@ -327,7 +463,6 @@ proc show-status {status b sb} {
             .scan-window.bot.2 configure -state disabled
             .scan-window.bot.4 configure -state disabled
         }
-        set searchEnable 0
     }
 }
 
@@ -346,51 +481,123 @@ proc insertWithTags {w text args} {
     }
 }
 
+proc popup-license {} {
+    global libdir
+    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
+
+    if {[file readable "${libdir}/LICENSE"]} {
+        set f [open "${libdir}/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
 
-    toplevelG $w
+    toplevel $w
 
     wm title $w "About target"
     top-down-window $w
 
+    frame $w.top.a -relief ridge -border 2
+    frame $w.top.p -relief ridge -border 2
+
+    pack $w.top.a $w.top.p -side top -fill x
+    
+    label $w.top.a.about -text "About"
+    label $w.top.a.irtcl -text $hostid \
+            -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
+    pack $w.top.a.about $w.top.a.irtcl -side top
+
     set i [z39 targetImplementationName]
-    label $w.top.in -text "Implementation name: $i"
+    label $w.top.p.in -text "Implementation name: $i"
     set i [z39 targetImplementationId]
-    label $w.top.ii -text "Implementation id: $i"
+    label $w.top.p.ii -text "Implementation id: $i"
     set i [z39 targetImplementationVersion]
-    label $w.top.iv -text "Implementation version: $i"
+    label $w.top.p.iv -text "Implementation version: $i"
     set i [z39 options]
-    label $w.top.op -text "Protocol options: $i"
+    label $w.top.p.op -text "Protocol options: $i"
 
-    pack $w.top.in $w.top.ii $w.top.iv $w.top.op -side top -anchor nw
+    pack $w.top.p.in $w.top.p.ii $w.top.p.iv $w.top.p.op -side top -anchor nw
 
-    bottom-buttons $w [list {Close} [list destroyG $w]] 1
+    bottom-buttons $w [list {Close} [list destroy $w]] 1
 }
 
-proc about-origin {} {
+proc about-origin-logo {n} {
+    global libdir
     set w .about-origin-w
+    if {![winfo exists $w]} {
+        return
+    }
+    incr n
+    if {$n==10} {
+        set n 1
+    }
+    $w.top.a.logo configure -bitmap @${libdir}/bitmaps/book$n
+    after 140 [list about-origin-logo $n]
+}
 
-    toplevelG $w
+proc about-origin {} {
+    set w .about-origin-w
+    global libdir
+    
+    if {[winfo exists $w]} {
+        destroy $w
+    }
+    toplevel $w
 
     wm title $w "About IrTcl"
     place-force $w .
     top-down-window $w
 
+    frame $w.top.a -relief ridge -border 2
+    frame $w.top.p -relief ridge -border 2
+
+    pack $w.top.a $w.top.p -side top -fill x
+    
+    label $w.top.a.irtcl -text "IrTcl" \
+            -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
+    label $w.top.a.logo -bitmap @${libdir}/bitmaps/book1 
+    pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
+
     set i [z39 implementationName]
-    label $w.top.in -text "Implementation name: $i"
+    label $w.top.p.in -text "Implementation name: $i"
     set i [z39 implementationId]
-    label $w.top.ii -text "Implementation id: $i"
+    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.in $w.top.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 destroyG $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
@@ -398,8 +605,10 @@ proc popup-marc {sno no b df} {
     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
@@ -430,11 +639,8 @@ proc popup-marc {sno no b df} {
         set new 1
     }
     $w.top.record delete 0.0 end
-
-    set ffunc [lindex $displayFormats $df]
-    set ffunc "display-$ffunc"
-
-    $ffunc $sno $no  $w.top.record 0
+    set recordType [z39.$sno recordType $no]
+    wm title $w "$recordType record #$no"
 
     if {$new} {
         bind $w.top.record <Return> {destroy .full-marc}
@@ -444,27 +650,17 @@ proc popup-marc {sno no b df} {
         
         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 destroyG $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
             }
@@ -475,24 +671,32 @@ proc popup-marc {sno no b df} {
         set i 0
         foreach f $displayFormats {
             $w.bot.formats.m entryconfigure $i \
-                    -command [list display-f $sno $no $w.top.record 0]
+                    -command [list display-$f $sno $no $w.top.record 0]
             incr i
         }
     }
+    set ffunc [lindex $displayFormats $df]
+    set ffunc "display-$ffunc"
+
+    $ffunc $sno $no $w.top.record 0
 }
 
-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    
 } 
 
@@ -500,9 +704,16 @@ proc 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
@@ -513,7 +724,7 @@ proc set-target-hotlist {} {
 proc reopen-target {target base} {
     close-target
     open-target $target $base
-    update-target-hotlist $target
+    update-target-hotlist $target $base
 }
 
 proc define-target-action {} {
@@ -523,7 +734,6 @@ proc define-target-action {} {
     if {$target == ""} {
         return
     }
-    update-target-hotlist $target
     foreach n [array names profile] {
         if {$n == $target} {
             protocol-setup $n
@@ -531,7 +741,7 @@ proc define-target-action {} {
         }
     }
     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]]
 
@@ -540,13 +750,15 @@ proc define-target-action {} {
 }
 
 proc fail-response {target} {
+    set c [lindex [z39 failInfo] 0]
+    set m [lindex [z39 failInfo] 1]
     close-target
-    tkerror "Target connection closed or protocol error"
+    tkerror "$m ($c)"
 }
 
-proc connect-response {target} {
-    puts "connect-response"
-    show-target $target
+proc connect-response {target base} {
+    dputs "connect-response"
+    show-target $target $base
     init-request
 }
 
@@ -556,24 +768,31 @@ proc open-target {target base} {
 
     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 options search present scan namedResultSets triggerResourceCtrl
-    show-status {Connecting} 1 {}
+    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
+    }
     set hostid $target
     .top.target.m disable 0
     .top.target.m enable 1
@@ -583,12 +802,16 @@ proc open-target {target base} {
 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
@@ -605,6 +828,7 @@ proc load-set-action {} {
     destroy .load-set
     if {$fname != ""} {
         show-status {Loading} 1 {}
+        update
         z39.$setNo loadFile $fname
 
         set no [z39.$setNo numberOfRecordsReturned]
@@ -623,11 +847,9 @@ proc load-set {} {
     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} \
@@ -648,37 +870,61 @@ proc init-request {} {
     }
     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
     }
 }
 
-proc search-request {} {
+proc search-request {bflag} {
     global setNo
     global profile
     global hostid
     global busy
     global cancelFlag
-    global searchEnable
+    global delayRequest
+    global recordSyntax
 
     set target $hostid
 
-    if {$searchEnable == 0} {
+    dputs "search-request"
+    show-message {}
+    if {!$bflag && $busy} {
+        dputs "busy: search-request ignored"
         return
     }
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Searching} 1 0
+        set delayRequest {search-request 1}
+        return
+    }
+    set delayRequest {} 
+
     set query [index-query]
     if {$query==""} {
         return
@@ -688,10 +934,10 @@ proc search-request {} {
 
     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
@@ -699,30 +945,59 @@ proc search-request {} {
     if {[lindex $profile($target) 9] == 1} {
         z39.$setNo queryType ccl
     }
+    dputs Setting
+    dputs $recordSyntax
+    z39.$setNo preferredRecordSyntax $recordSyntax
     z39 callback {search-response}
     z39.$setNo search $query
-    show-status {Search} 1 0
+    show-status {Searching} 1 0
 }
 
-proc scan-request {attr} {
+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 {} {
     set w .scan-window
 
     global profile
     global hostid
     global scanView
     global scanTerm
+    global curIndexEntry
+    global queryButtonsFind
+    global queryInfoFind
+    global cancelFlag
+    global delayRequest
+
+    dputs "scan-request"
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Scanning} 1 0
+        set delayRequest scan-request
+        return
+    }
+    set delayRequest {} 
 
     set target $hostid
     set scanView 0
     set scanTerm {}
 
+    set b [lindex $queryButtonsFind $curIndexEntry]
+    set attr {}
+    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
@@ -742,20 +1017,21 @@ proc scan-request {attr} {
             pack $w.top.list -side left -fill both -expand yes
         }
         
-        bottom-buttons $w [list {Close} [list destroyG $w] \
+        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]
-
-#       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} {
@@ -774,31 +1050,39 @@ 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 cancelFlag
+    global delayRequest
     global scanTerm
     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]} {
+        if {$cancelFlag} {
+            set cancelFlag 0
+            dputs "Handling cancel"
+            if {$delayRequest != ""} {
+                eval $delayRequest
+            }
+            return
+        }
         show-status {Ready} 0 1
-        set cancelFlag 0
         return
     }
     set nScanTerm [$w.top.entry get]
@@ -807,13 +1091,13 @@ proc scan-response {attr start toget} {
         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]
@@ -840,32 +1124,36 @@ proc scan-response {attr start toget} {
         }
     }
     if {$cancelFlag} {
-        show-status {Ready} 0 1
+        dputs "Handling cancel"
         set cancelFlag 0
+        if {$delayRequest != ""} {
+            eval $delayRequest
+        }
         return
     }
+    set delayRequest {}
     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
@@ -873,7 +1161,7 @@ proc scan-response {attr start toget} {
             z39.scan numberOfTermsRequested $ntoget
             z39.scan preferredPositionInResponse [incr ntoget]
         }
-        puts "${attr} \{$q\}"
+        dputs "${attr} \{$q\}"
         z39.scan scan "${attr} \{$q\}"
         return
     }
@@ -882,6 +1170,17 @@ proc scan-response {attr start toget} {
 
 proc scan-down {attr} {
     global scanView
+    global cancelFlag
+    global delayRequest
+
+    dputs {scan-down}
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Scanning down} 1 0
+        set delayRequest [list scan-down $attr]
+        return
+    }
+    set delayRequest {} 
 
     set w .scan-window
     set scanView [expr $scanView + 5]
@@ -889,11 +1188,11 @@ proc scan-down {attr} {
     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
     }
@@ -902,16 +1201,27 @@ proc scan-down {attr} {
 
 proc scan-up {attr} {
     global scanView
+    global cancelFlag
+    global delayRequest
+
+    dputs {scan-up}
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Scanning up} 1 0
+        set delayRequest [list scan-up $attr]
+        return
+    }
+    set delayRequest {} 
 
     set w .scan-window
     set scanView [expr $scanView - 5]
     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
     }
@@ -924,16 +1234,26 @@ proc search-response {} {
     global setMax
     global cancelFlag
     global busy
+    global delayRequest
 
-    puts "In search-response"
+    dputs "In search-response"
+    if {$cancelFlag} {
+        dputs "Handling cancel"
+        set cancelFlag 0
+        if {$delayRequest != ""} {
+            eval $delayRequest
+        }
+        return
+    }
+    set delayRequest {}
     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]
@@ -947,30 +1267,36 @@ proc search-response {} {
         set setMax 20
     }
     set setOffset 1
-    if {$cancelFlag} {
-        set cancelFlag 0
-        return
-    }
+    show-status {Ready} 0 1
     z39 callback {present-response}
     z39.$setNo present $setOffset 1
-    show-status {Retrieve} 1 0
+    show-status {Retrieving} 1 0
 }
 
 proc present-more {number} {
     global setNo
     global setOffset
     global setMax
+    global busy
+    global cancelFlag
+    global delayRequest
+
+    dputs "present-more"
+    if {$cancelFlag} {
+        show-status {Retrieving} 1 0
+        set delayRequest "present-more $number"
+        return
+    }
+    set delayRequest {}
 
-    puts "setOffset=$setOffset"
-    puts "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 == ""} {
@@ -991,7 +1317,7 @@ proc present-more {number} {
         set toGet 3
     } 
     z39.$setNo present $setOffset $toGet
-    show-status {Retrieve} 1 0
+    show-status {Retrieving} 1 0
 }
 
 proc init-title-lines {} {
@@ -1007,7 +1333,7 @@ proc add-title-lines {setno no offset} {
     global displayFormat
     global lastSetNo
 
-    if {$setno == 0} {
+    if {$setno == -1} {
         set setno $lastSetNo
     } else {
         set lastSetNo $setno
@@ -1017,6 +1343,7 @@ proc add-title-lines {setno no offset} {
         .data.record delete 0.0 end
     }
     set ffunc [lindex $displayFormats $displayFormat]
+    dputs "ffunc=$ffunc"
     set ffunc "display-$ffunc"
     for {set i 0} {$i < $no} {incr i} {
         set o [expr $i + $offset]
@@ -1024,11 +1351,14 @@ proc add-title-lines {setno no offset} {
         if {$type == ""} {
             break
         }
+        .data.record tag bind r$o <Any-Enter> {}
+        .data.record tag bind r$o <Any-Leave> {}
         set insert0 [.data.record index insert]
         $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
     }
 }
 
@@ -1037,12 +1367,21 @@ proc present-response {} {
     global setOffset
     global setMax
     global cancelFlag
+    global delayRequest
 
-    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]
+    if {$cancelFlag} {
+        dputs "Handling cancel"
+        set cancelFlag 0
+        if {$delayRequest != ""} {
+            eval $delayRequest
+        }
+        return
+    }
     set status [z39.$setNo responseStatus]
     if {[lindex $status 0] == "NSD"} {
         show-status {Ready} 0 1
@@ -1052,20 +1391,15 @@ proc present-response {} {
         tkerror "NSD$code: $msg: $addinfo"
         return
     }
-    if {$cancelFlag} {
-        show-status {Ready} 0 1
-        set cancelFlag 0
-        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
     }
 }
 
@@ -1131,6 +1465,22 @@ proc define-target-dialog {} {
     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
@@ -1164,8 +1514,8 @@ proc protocol-setup-action {target} {
             $wno]
 
     cascade-target-list
-    puts $profile($target)
-    destroyG $w
+    dputs $profile($target)
+    destroy $w
 }
 
 proc place-force {window parent} {
@@ -1220,10 +1570,17 @@ proc delete-database {target} {
 
     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
+        }
     }
 }
 
@@ -1247,8 +1604,8 @@ proc protocol-setup {target} {
     if {$target == ""} {
         set target Default
     }
-    puts target
-    puts $profile($target)
+    dputs target
+    dputs $profile($target)
 
     frame $w.top.host
     frame $w.top.port
@@ -1270,11 +1627,11 @@ proc protocol-setup {target} {
             maximumRecordSize preferredMessageSize} \
             {{Description:} {Host:} {Port:} {Id Authentication:} \
             {Maximum Record Size:} {Preferred Message Size:}} \
-            [list protocol-setup-action $target] [list destroyG $w]
+            [list protocol-setup-action $target] [list destroy $w]
     
     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]
     }
@@ -1290,11 +1647,11 @@ proc protocol-setup {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" \
@@ -1319,31 +1676,31 @@ proc protocol-setup {target} {
     }
 
     # 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
@@ -1356,7 +1713,8 @@ proc protocol-setup {target} {
 
     # Ok-cancel
     bottom-buttons $w [list {Ok} [list protocol-setup-action $target] \
-            {Cancel} [list destroyG $w]] 0   
+            {Delete} [list protocol-setup-delete $target] \
+            {Cancel} [list destroy $w]] 0   
 }
 
 proc database-select-action {} {
@@ -1408,13 +1766,12 @@ 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]
+            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
@@ -1438,33 +1795,123 @@ proc cascade-target-list {} {
     }
 }
 
+proc query-select {i} {
+    global queryButtonsFind
+    global queryInfoFind
+    global queryButtons
+    global queryInfo
+
+    set queryInfoFind [lindex $queryInfo $i]
+    set queryButtonsFind [lindex $queryButtons $i]
+
+    index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
+}
+
+proc query-new-action {} {
+    global queryTypes
+    global queryButtons
+    global queryInfo
+    global settingsChanged
+
+    set settingsChanged 1
+    lappend queryTypes [.query-new.top.index.entry get]
+    lappend queryButtons {}
+    lappend queryInfo {}
+
+    destroy .query-new
+    cascade-query-list
+}
+
+proc query-new {} {
+    set w .query-new
+
+    toplevel $w
+    place-force $w .
+    top-down-window $w
+    frame $w.top.index
+    pack $w.top.index \
+            -side top -anchor e -pady 2 
+    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
 
     set i 0
-    .top.options.m.slist delete 0 last
+    $w.slist delete 0 last
     foreach n $queryTypes {
-        .top.options.m.slist add command -label $n \
-                -command [list query-setup $i]
+        $w.slist add command -label $n -command [list query-setup $i]
         incr i
     }
 
     set i 0
-    .top.options.m.clist delete 0 last
+    $w.clist delete 0 last
     foreach n $queryTypes {
-        .top.options.m.clist add command -label $n \
-                -command [list query-select $i]
+        $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
+    global recordSyntax
     
     set windowGeometry(.) [wm geometry .]
 
-    set f [open "clientg.tcl" w]
+    set f [open "~/.clientrc.tcl" w]
 
+    puts $f "set hotTargets \{ $hotTargets \}"
+    puts $f "set textWrap $textWrap"
+    puts $f "set displayFormat $displayFormat"
+    puts $f "set popupMarcdf $popupMarcdf"
+    puts $f "set recordSyntax $recordSyntax"
     foreach n [array names windowGeometry] {
         puts -nonewline $f "set \{windowGeometry($n)\} \{"
         puts -nonewline $f $windowGeometry($n)
@@ -1474,16 +1921,18 @@ proc save-geometry {} {
 }
 
 proc save-settings {} {
-    global hotTargets 
     global profile
+    global libdir
     global settingsChanged
     global queryTypes
     global queryButtons
     global queryInfo
-    
-    set f [open "clientrc.tcl" w]
+   
+    if {![file writable "${libdir}/clientrc.tcl"]} {
+	return
+    }
+    set f [open "${libdir}/clientrc.tcl" w]
     puts $f "# Setup file"
-    puts $f "set hotTargets \{ $hotTargets \}"
 
     foreach n [array names profile] {
         puts -nonewline $f "set \{profile($n)\} \{"
@@ -1514,9 +1963,11 @@ proc alert {ask} {
     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
@@ -1532,13 +1983,13 @@ proc alert-action {} {
 proc exit-action {} {
     global settingsChanged
 
-    save-geometry
     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
         }
     }
+    save-geometry
     exit 0
 }
 
@@ -1578,7 +2029,7 @@ proc listbutton {button no names} {
 proc listbuttonv-action {button var names i} {
     global $var
 
-    set $var $i
+    set $var [lindex $names [expr $i+1]]
     $button configure -text [lindex $names $i]
 }
 
@@ -1595,7 +2046,11 @@ proc listbuttonv {button var names} {
             break
         }
     }
-    menubutton $button -text $n -width 10 -menu ${button}.m \
+    if {[winfo exists $button]} {
+        $button configure -text $n
+        return
+    }
+    menubutton $button -text $n -menu ${button}.m \
             -relief raised -border 1
     menu ${button}.m
     for {set i 0} {$i < $l} {incr i 2} {
@@ -1605,13 +2060,14 @@ proc listbuttonv {button var names} {
 }
 
 proc query-add-index-action {queryNo} {
-    set w .setup-query-$queryNo
+    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
@@ -1620,7 +2076,7 @@ proc query-add-index-action {queryNo} {
 }
 
 proc query-add-line {queryNo} {
-    set w .setup-query-$queryNo
+    set w .query-setup
 
     global queryInfoTmp
     global queryButtonsTmp
@@ -1634,7 +2090,7 @@ proc query-add-line {queryNo} {
 }
 
 proc query-del-line {queryNo} {
-    set w .setup-query-$queryNo
+    set w .query-setup
 
     global queryInfoTmp
     global queryButtonsTmp
@@ -1652,14 +2108,14 @@ proc query-add-index {queryNo} {
     set w .query-add-index
 
     toplevel $w
-    place-force $w .setup-query-$queryNo
+    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
 }
 
@@ -1670,6 +2126,10 @@ proc query-setup-action {queryNo} {
     global queryInfoTmp
     global queryButtonsFind
     global queryInfoFind
+    
+    global settingsChanged 
+
+    set settingsChanged 1
 
     set queryInfo [lreplace $queryInfo $queryNo $queryNo \
             $queryInfoTmp]
@@ -1678,22 +2138,17 @@ proc query-setup-action {queryNo} {
     set queryInfoFind $queryInfoTmp
     set queryButtonsFind $queryButtonsTmp
 
-    puts $queryInfo
-    puts $queryButtons
-    destroy .setup-query-$queryNo
-
+    destroy .query-setup
     index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
 }
 
 proc activate-e-index {value no i} {
     global queryButtonsTmp
+    global queryIndexTmp
     
-    puts $queryButtonsTmp
     set queryButtonsTmp [lreplace $queryButtonsTmp $no $no [list I $i]]
-    puts $queryButtonsTmp
-    puts "value $value"
-    puts "no $no"
-    puts "i $i"
+    dputs $queryButtonsTmp
+    set queryIndexTmp $i
 }
 
 proc activate-index {value no i} {
@@ -1701,39 +2156,249 @@ proc activate-index {value no i} {
 
     set queryButtonsFind [lreplace $queryButtonsFind $no $no [list I $i]]
 
-    puts "queryButtonsFind $queryButtonsFind"
-    puts "value $value"
-    puts "no $no"
-    puts "i $i"
+    dputs "queryButtonsFind $queryButtonsFind"
 }
 
-proc query-setup {queryNo} {
-    set w .setup-query-$queryNo
-    global queryTypes
-    set queryTypes {Simple}
-    global queryButtons
-    global queryInfo
-    global queryButtonsTmp
-    global queryInfoTmp
-    
+proc update-attr {} {
+    set w .index-setup
+    listbuttonv $w.top.relation.b relationTmpValue\
+            {{None} 0 {Less than} 1 {Greater than or equal} 2 {Equal} 3 \
+            {Greater than or equal} 4 {Greater than} 5 {Not equal} 6 \
+            {Phonetic} 100 {Stem} 101 {Relevance} 102 {AlwaysMatches} 103}
+    listbuttonv $w.top.position.b positionTmpValue {{None} 0 \
+            {First in field} 1 {First in subfield} 2 {Any position in field} 3}
+    listbuttonv $w.top.structure.b structureTmpValue {{None} 0 {Phrase} 1 \
+            {Word} 2 {Key} 3 {Year} 4 {Date (norm)} 5 {Word list}  6 \
+            {Date (un-norm)} 100 {Name (norm)} 101 {Date (un-norm)} 102 \
+            {Structure} 103 {urx} 104 {free-form} 105 {doc-text} 106 \
+            {local-number} 107 {string} 108 {numeric string} 109}
+    listbuttonv $w.top.truncation.b truncationTmpValue {{Auto} 0 {Right} 1 \
+            {Left} 2 {Left and right} 3 {No truncation} 100 \
+            {Process #} 101 {Re-1} 102 {Re-2} 103}
+    listbuttonv $w.top.completeness.b completenessTmpValue {{None} 0 \
+            {Incomplete subfield} 1 {Complete subfield} 2 {Complete field} 3}
+}
+
+proc use-attr {init} {
+    set attr {
+        {None}                           0
+        {Personal name}                  1 
+        {Corporate name}                 2 
+        {Conference name}                3 
+        {Title}                          4 
+        {Title-series}                   5 
+        {Title-uniform}                  6 
+        {ISBN}                           7 
+        {ISSN}                           8 
+        {LC card number}                 9 
+        {BNB card number}                10
+        {BGF(sic) number}                11 
+        {Local number}                   12 
+        {Dewey classification}           13 
+        {UDC classification}             14 
+        {Bliss classification}           15 
+        {LC call number}                 16 
+        {NLM call number}                17 
+        {NAL call number}                18 
+        {MOS call number}                19 
+        {Local classification}           20 
+        {Subject heading}                21 
+        {Subject-RAMEAU}                 22 
+        {BDI-index-subject}              23 
+        {INSPEC-subject}                 24 
+        {MESH-subject}                   25 
+        {PA-subject}                     26 
+        {LC-subject-heading}             27 
+        {RVM-subject-heading}            28 
+        {Local subject index}            29 
+        {Date}                           30 
+        {Date of publication}            31 
+        {Date of acquisition}            32 
+        {Title-key}                      33 
+        {Title-collective}               34 
+        {Title-parallel}                 35 
+        {Title-cover}                    36 
+        {Title-added-title-page}         37 
+        {Title-caption}                  38 
+        {Title-running}                  39 
+        {Title-spine}                    40 
+        {Title-other-variant}            41 
+        {Title-former}                   42 
+        {Title-abbreviated}              43 
+        {Title-expanded}                 44 
+        {Subject-PRECIS}                 45 
+        {Subject-RSWK}                   46 
+        {Subject-subdivision}            47 
+        {Number-natl-bibliography}       48 
+        {Number-legal-deposit}           49 
+        {Number-govt-publication}        50 
+        {Number-publisher-for-music}     51 
+        {Number-DB}                      52 
+        {Number-local-call}              53 
+        {Code-language}                  54 
+        {Code-geographic-area}           55 
+        {Code-institution}               56 
+        {Name and title}                 57 
+        {Name-geographic}                58 
+        {Place-publication}              59 
+        {CODEN}                          60 
+        {Microform-generation}           61 
+        {Abstract}                       62 
+        {Note}                           63 
+        {Author-title}                 1000 
+        {Record type}                  1001 
+        {Name}                         1002 
+        {Author}                       1003 
+        {Author-name-personal}         1004 
+        {Author-name-corporate}        1005 
+        {Author-name-conference}       1006 
+        {Identifier-standard}          1007 
+        {Subject-LC-children's}        1008 
+        {Subject-name-personal}        1009 
+        {Body of text}                 1010 
+        {Date/time added to database}  1011 
+        {Date/time last modified}      1012 
+        {Authority/format identifier}  1013 
+        {Concept-text}                 1014 
+        {Concept-reference}            1015 
+        {Any}                          1016 
+        {Server choice}                1017 
+        {Publisher}                    1018 
+        {Record source}                1019 
+        {Editor}                       1020 
+        {Bib-level}                    1021 
+        {Geographic class}             1022 
+        {Indexed by}                   1023 
+        {Map scale}                    1024 
+        {Music key}                    1025 
+        {Related periodical}           1026 
+        {Report number}                1027 
+        {Stock number}                 1028 
+        {Thematic number}              1030 
+        {Material type}                1031 
+        {Doc ID}                       1032 
+        {Host item}                    1033 
+        {Content type}                 1034 
+        {Anywhere}                     1035 
+    }
+    set w .index-setup
+    global useTmpValue
+    set l [llength $attr]
+
+    if {$init} {
+        set s 0
+        set lno 0
+        for {set i 0} {$i < $l} {incr i} {
+            $w.top.use.list insert end [lindex $attr $i]
+            incr i
+            if {$useTmpValue == [lindex $attr $i]} {
+                set s $lno
+            }
+            incr lno
+        }
+        $w.top.use.list select from $s
+        $w.top.use.list select to $s
+        incr s -3
+        if {$s < 0} {
+            set s 0
+        }
+        $w.top.use.list yview $s
+    } else {
+        set lno [lindex [$w.top.use.list curselection] 0]
+        set i [expr $lno+$lno+1]
+        set useTmpValue [lindex $attr $i]
+        dputs "useTmpValue=$useTmpValue"
+    }
+}
+
+proc index-setup-action {oldAttr queryNo indexNo} {
+    set attr [lindex $oldAttr 0]
+
+    global useTmpValue
     global relationTmpValue
     global structureTmpValue
     global truncationTmpValue
     global completenessTmpValue
     global positionTmpValue
+    global queryInfoTmp
 
-    set queryName [lindex $queryTypes $queryNo]
-    set queryInfoTmp [lindex $queryInfo $queryNo]
-    set queryButtonsTmp [lindex $queryButtons $queryNo]
+    use-attr 0
 
-    toplevel $w
+    dputs "index-setup-action"
+    dputs "queryNo $queryNo"
+    dputs "indexNo $indexNo"
+    if {$useTmpValue > 0} {
+        lappend attr "1=$useTmpValue"
+    }
+    if {$relationTmpValue > 0} {
+        lappend attr "2=$relationTmpValue"
+    }
+    if {$positionTmpValue > 0} {
+        lappend attr "3=$positionTmpValue"
+    }
+    if {$structureTmpValue > 0} {
+        lappend attr "4=$structureTmpValue"
+    }
+    if {$truncationTmpValue > 0} {
+        lappend attr "5=$truncationTmpValue"
+    }
+    if {$completenessTmpValue > 0} {
+        lappend attr "6=$completenessTmpValue"
+    }
+    dputs "new attr $attr"
+    set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
+    destroy .index-setup
+}
 
-    wm title $w "Query setup $queryName"
-    place-force $w .
+proc index-setup {attr queryNo indexNo} {
+    set w .index-setup
+
+    global relationTmpValue
+    global structureTmpValue
+    global truncationTmpValue
+    global completenessTmpValue
+    global positionTmpValue
+    global useTmpValue
+    set relationTmpValue 0
+    set truncationTmpValue 0
+    set structureTmpValue 0
+    set positionTmpValue 0
+    set completenessTmpValue 0
+    set useTmpValue 0
+
+    set len [llength $attr]
+    for {set i 1} {$i < $len} {incr i} {
+        set q [lindex $attr $i]
+        set l [string first = $q]
+        if {$l > 0} {
+            set t [string range $q 0 [expr $l - 1]]
+            set v [string range $q [expr $l + 1] end]
+            switch $t {
+                1
+                { set useTmpValue $v }
+                2
+                { set relationTmpValue $v }
+                3
+                { set positionTmpValue $v }
+                4
+                { set structureTmpValue $v }
+                5
+                { set truncationTmpValue $v }
+                6
+                { set completenessTmpValue $v }
+            }
+        }
+    }
+    if {[winfo exists $w]} {
+        destroy $w
+    }
+    toplevelG $w
+
+    set n [lindex $attr 0]
+    wm title $w "Index setup $n"
 
     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
@@ -1741,18 +2406,14 @@ proc query-setup {queryNo} {
     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
+    update-attr
 
     # 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 \
+    listbox $w.top.use.list -geometry 26x10 \
             -yscrollcommand "$w.top.use.scroll set"
     scrollbar $w.top.use.scroll -orient vertical -border 1
     pack $w.top.use.label -side top -fill x \
@@ -1763,21 +2424,13 @@ proc query-setup {queryNo} {
             -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
-    }
+    use-attr 1
 
     # Relation Attributes
 
     pack $w.top.relation -pady 6 -padx 6 -side top
     label $w.top.relation.label -text "Relation" -width 18
     
-    set relationTmpValue 0
-    listbuttonv $w.top.relation.b relationTmpValue\
-            {{None} 0 {Less than} 1 {Greater than or equal} 2 {Equal} 3 \
-            {Greater than or equal} 4 {Greater than} 5 {Not equal} 6 \
-            {Phonetic} 100 {Stem} 101 {Relevance} 102 {AlwaysMatches} 103}
-    
     pack $w.top.relation.label $w.top.relation.b -fill x 
 
     # Position Attributes
@@ -1785,10 +2438,6 @@ proc query-setup {queryNo} {
     pack $w.top.position -pady 6 -padx 6 -side top
     label $w.top.position.label -text "Position" -width 18
 
-    set positionTmpValue 0
-    listbuttonv $w.top.position.b positionTmpValue {{None} 0 \
-            {First in field} 1 {First in subfield} 2 {Any position in field} 3}
-    
     pack $w.top.position.label $w.top.position.b -fill x
 
     # Structure Attributes
@@ -1796,13 +2445,6 @@ proc query-setup {queryNo} {
     pack $w.top.structure -pady 6 -padx 6 -side top
     label $w.top.structure.label -text "Structure" -width 18
 
-    set structureTmpValue 0
-    listbuttonv $w.top.structure.b structureTmpValue {{None} 0 {Phrase} 1 \
-            {Word} 2 {Key} 3 {Year} 4 {Date (norm)} 5 {Word list}  6 \
-            {Date (un-norm)} 100 {Name (norm)} 101 {Date (un-norm)} 102 \
-            {Structure} 103 {urx} 104 {free-form} 105 {doc-text} 106 \
-            {local-number} 107 {string} 108 {numeric string} 109}
-
     pack $w.top.structure.label $w.top.structure.b -fill x
 
     # Truncation Attributes
@@ -1810,10 +2452,6 @@ proc query-setup {queryNo} {
     pack $w.top.truncation -pady 6 -padx 6 -side top
     label $w.top.truncation.label -text "Truncation" -width 18
 
-    set truncationTmpValue 0
-    listbuttonv $w.top.truncation.b truncationTmpValue {{Auto} 0 {Right} 1 \
-            {Left} 2 {Left and right} 3 {No truncation} 100 \
-            {Process #} 101 {Re-1} 102 {Re-2} 103}
     pack $w.top.truncation.label $w.top.truncation.b -fill x
 
     # Completeness Attributes
@@ -1821,17 +2459,105 @@ proc query-setup {queryNo} {
     pack $w.top.completeness -pady 6 -padx 6 -side top
     label $w.top.completeness.label -text "Completeness" -width 18
 
-    set completenessTmpValue 0
-    listbuttonv $w.top.completeness.b completenessTmpValue {{None} 0 \
-            {Incomplete subfield} 1 {Complete subfield} 2 {Complete field} 3}
     pack $w.top.completeness.label $w.top.completeness.b -fill x
 
     # Ok-cancel
     bottom-buttons $w [list \
+            {Ok} [list index-setup-action $attr $queryNo $indexNo] \
+            {Cancel} [list destroy $w]] 0
+
+}
+
+proc query-edit-index {queryNo} {
+    global queryInfoTmp
+    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 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 .query-setup
+
+    global queryTypes
+    global queryButtons
+    global queryInfo
+    global queryButtonsTmp
+    global queryInfoTmp
+    global queryIndexTmp
+    
+    set queryIndexTmp 0
+    set queryName [lindex $queryTypes $queryNo]
+    set queryInfoTmp [lindex $queryInfo $queryNo]
+    set queryButtonsTmp [lindex $queryButtons $queryNo]
+
+    toplevelG $w
+
+    wm minsize $w 0 0
+    wm title $w "Query setup $queryName"
+
+    top-down-window $w
+
+    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
+
+    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]
+
+    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] \
-            {Add line} [list query-add-line $queryNo] \
-            {Delete line} [list query-del-line $queryNo] \
+            {Edit index} [list query-edit-index $queryNo] \
+            {Delete index} [list query-delete-index $queryNo] \
             {Cancel} [list destroy $w]] 0
 }
 
@@ -1855,9 +2581,28 @@ proc index-query {} {
     foreach b $queryButtonsFind {
         set term [string trim [.lines.$i.e get]]
         if {$term != ""} {
-            set attr [lindex [lindex $queryInfoFind [lindex $b 1]] 1]
-
+            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}"
             }
@@ -1869,10 +2614,17 @@ proc index-query {} {
         }
         incr i
     }
-    puts "qs=  $qs"
+    dputs "qs=  $qs"
     return $qs
 }
 
+proc index-focus-in {w i} {
+    global curIndexEntry
+
+    $w.$i configure -background red
+    set curIndexEntry $i
+}
+
 proc index-lines {w realOp buttonInfo queryInfo handle} {
     set i 0
     foreach b $buttonInfo {
@@ -1884,8 +2636,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
         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 <FocusIn> [list index-focus-in $w $i]
                 bind $w.$i.e <FocusOut> [list $w.$i configure \
                         -background white]
                 pack $w.$i.l -side left
@@ -1893,7 +2644,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
                 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
+                bind $w.$i.e <Return> {search-request 0}
             }
         } else {
             pack $w.$i.l -side left
@@ -1974,13 +2725,13 @@ 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
+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}
@@ -1997,19 +2748,18 @@ menu .top.target.m.clist
 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 0}
+.top.service.m add command -label "Scan" -command {scan-request}
+
 .top.service configure -state disabled
 
 menubutton .top.rset -text "Set" -menu .top.rset.m
@@ -2017,24 +2767,63 @@ 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 "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
+.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
+.top.options.m add cascade -label "Syntax" -menu .top.options.m.syntax
+
+menu .top.options.m.query
+.top.options.m.query add cascade -label "Select" \
+        -menu .top.options.m.query.clist
+.top.options.m.query add cascade -label "Edit" \
+        -menu .top.options.m.query.slist
+.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.slist
-menu .top.options.m.clist
 menu .top.options.m.formats
-cascade-query-list
 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}
+
+menu .top.options.m.syntax
+.top.options.m.syntax add radiobutton -label "USMARC" \
+        -value USMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "UNIMARC" \
+        -value UNIMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "UKMARC" \
+        -value UKMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "DANMARC" \
+        -value DANMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "FINMARC" \
+        -value FINMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "NORMARC" \
+        -value NORMARC -variable recordSyntax
+.top.options.m.syntax add radiobutton -label "PICAMARC" \
+        -value PICAMARC -variable recordSyntax
+.top.options.m.syntax add separator
+.top.options.m.syntax add radiobutton -label "SUTRS" \
+        -value SUTRS -variable recordSyntax
+
 menubutton .top.help -text "Help" -menu .top.help.m
 menu .top.help.m
 
@@ -2047,10 +2836,10 @@ 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 \
+button .mid.search -width 7 -text {Search} -command {search-request 0} \
         -state disabled
 button .mid.scan -width 7 -text {Scan} \
-        -command [list scan-request "@attr 1=4 @attr 5=1 @attr 4=1"] -state disabled 
+        -command scan-request -state disabled 
 button .mid.present -width 7 -text {Present} -command [list present-more 10] \
         -state disabled
 
@@ -2059,11 +2848,11 @@ pack .mid.search .mid.scan .mid.present .mid.clear -side left \
         -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
-readonlyText .data.record
+initBindings
 
 if {[tk colormodel .] == "color"} {
     .data.record tag configure marc-tag -foreground blue
@@ -2074,7 +2863,7 @@ if {[tk colormodel .] == "color"} {
 }
 .data.record tag configure marc-data -foreground black
 
-button .bot.logo  -bitmap @book1 -command cancel-operation
+button .bot.logo  -bitmap @${libdir}/bitmaps/book1 -command cancel-operation
 frame .bot.a
 pack .bot.a -side left -fill x
 pack .bot.logo -side right -padx 2 -pady 2
@@ -2092,11 +2881,7 @@ pack .bot.a.target -side top -anchor nw -padx 2 -pady 2
 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