X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=client.tcl;h=6997bb66658fb9c6a4aa16de350cedd3bc32e100;hb=541b10670bd7bceaf0d0525f2fa128f461281d89;hp=9c72789564e09aa782b45f35f5fd2c6b8a619eca;hpb=93376f52b1f8d3fc62d5a8f5879eabecfc65b995;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index 9c72789..6997bb6 100644
--- a/client.tcl
+++ b/client.tcl
@@ -1,6 +1,96 @@
+# IR toolkit for tcl/tk
+# (c) Index Data 1995
+# See the file LICENSE for details.
+# Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.13  1995-03-21 17:27:26  adam
+# 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
+# Text widget used in main window (instead of listbox) to support
+# better presentation formats.
+#
+# Revision 1.34  1995/06/12  07:59:07  adam
+# More work on geometry handling.
+#
+# Revision 1.33  1995/06/09  11:17:35  adam
+# Start work on geometry management.
+#
+# Revision 1.32  1995/06/07  09:16:37  adam
+# New presentation format.
+#
+# Revision 1.31  1995/06/06  16:31:09  adam
+# Bug fix: target names couldn't contain blanks.
+# Bug fix: scan.
+#
+# Revision 1.30  1995/06/06  11:35:41  adam
+# Work on scan. Display of old sets.
+#
+# Revision 1.29  1995/06/05  14:11:18  adam
+# Bug fix in present-more.
+#
+# Revision 1.28  1995/06/02  14:52:13  adam
+# Minor changes really.
+#
+# Revision 1.27  1995/06/02  14:29:42  adam
+# Work on scan interface - up/down buttons.
+#
+# Revision 1.26  1995/06/01  16:36:46  adam
+# About buttons. Minor bug fixes.
+#
+# Revision 1.25  1995/05/31  13:09:57  adam
+# Client searches/presents may be interrupted.
+# New moving book-logo.
+#
+# Revision 1.24  1995/05/31  08:36:24  adam
+# Bug fix in client.tcl: didn't save options on clientrc.tcl.
+# New method: referenceId. More work on scan.
+#
+# Revision 1.23  1995/05/29  10:33:41  adam
+# README and rename of startup script.
+#
+# Revision 1.22  1995/05/26  11:44:09  adam
+# Bugs fixed. More work on MARC utilities and queries. Test
+# client is up-to-date again.
+#
+# Revision 1.21  1995/05/11  15:34:46  adam
+# Scan request changed a bit. This version works with RLG.
+#
+# Revision 1.20  1995/04/21  16:31:57  adam
+# New radiobutton: protocol (z39v2/SR).
+#
+# Revision 1.19  1995/04/18  16:11:50  adam
+# First version of graphical Scan. Some work on query-by-form.
+#
+# Revision 1.18  1995/04/10  10:50:22  adam
+# Result-set name defaults to suffix of ir-set name.
+# Started working on scan. Not finished at this point.
+#
+# Revision 1.17  1995/03/31  09:34:57  adam
+# Search-button disabled when there is no connection.
+#
+# Revision 1.16  1995/03/31  08:56:36  adam
+# New button "Search".
+#
+# Revision 1.15  1995/03/28  12:45:22  adam
+# New ir method failback: called on disconnect/protocol error.
+# New ir set/get method: protocol: SR / Z3950.
+# Simple popup and disconnect when failback is invoked.
+#
+# Revision 1.14  1995/03/22  16:07:55  adam
+# Minor changes.
+#
+# Revision 1.13  1995/03/21  17:27:26  adam
 # Short-hand keys in setup.
 #
 # Revision 1.12  1995/03/21  13:41:03  adam
@@ -45,73 +135,221 @@ set hotTargets {}
 set hotInfo {}
 set busy 0
 
-set profile(Default) {{} {} {210} {} 16384 8192 tcpip {}}
+set libDir ""
+
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
 set hostid Default
 set settingsChanged 0
 set setNo 0
+set lastSetNo 0
+set cancelFlag 0
+set searchEnable 0
+set fullMarcSeq 0
+set displayFormat 1
+
+set queryTypes {Simple}
+set queryButtons { { {I 0} {I 1} {I 2} } }
+set queryInfo { { {Title {1=4 4=1}} {Author {1=1}} \
+        {Subject {1=21}} {Any {1=1016}} } }
+wm minsize . 0 0
+
+proc read-formats {} {
+    global displayFormats
+    set formats [glob -nocomplain formats/*.tcl]
+    foreach f $formats {
+        source $f
+        set l [expr [string length $f] - 5]
+ 	lappend displayFormats [string range $f 8 $l]
+    }
+}
+
+proc set-display-format {f} {
+    global displayFormat
+    global setNo
 
-wm minsize . 300 200
+    set displayFormat $f
+    if {$setNo == 0} {
+        return
+    }
+    .bot.a.status configure -text "Reformatting"
+    update idletasks
+    add-title-lines 0 10000 1
+    .bot.a.status configure -text "Done"
+}
+
+proc initBindings {} {
+    set w Text
+    bind $w <1> {}
+    bind $w <Double-1> {}
+    bind $w <Triple-1> {}
+    bind $w <B1-Motion> {}
+    bind $w <Shift-1> {}
+    bind $w <Shift-B1-Motion> {}
+    bind $w <2> {}
+    bind $w <B2-Motion> {}
+    bind $w <Any-KeyPress> {}
+    bind $w <Return> {}
+    bind $w <BackSpace> {}
+    bind $w <Delete> {}
+    bind $w <Control-h> {}
+    bind $w <Control-d> {}
+    bind $w <Control-v> {}
+
+    set w Listbox
+    bind $w <B1-Motion> {}
+    bind $w <Shift-B1-Motion> {}
+}
+
+proc destroyGW {w} {
+    global windowGeometry
+    set windowGeometry($w) [wm geometry $w]
+}    
+proc toplevelG {w} {
+    global windowGeometry
+
+    toplevel $w
+    if {[info exists windowGeometry($w)]} {
+        set g $windowGeometry($w)
+        if {$g != ""} {
+            wm geometry $w $g
+        }
+    }
+    bind $w <Destroy> [list destroyGW $w]
+}
+
+if {[file readable "clientrc.tcl"]} {
+    source "clientrc.tcl"
+}
 
-if {[file readable "~/.tk-c"]} {
-    source "~/.tk-c"
+if {[file readable "clientg.tcl"]} {
+    source "clientg.tcl"
 }
 
+set queryButtonsFind [lindex $queryButtons 0]
+set queryInfoFind [lindex $queryInfo 0]
+
 proc top-down-window {w} {
     frame $w.top -relief raised -border 1
     frame $w.bot -relief raised -border 1
     
-    pack  $w.top $w.bot -side top -fill both -expand yes
+    pack  $w.top -side top -fill both -expand yes
+    pack  $w.bot -fill both
 }
 
 proc top-down-ok-cancel {w ok-action g} {
     frame $w.bot.left -relief sunken -border 1
-    pack $w.bot.left -side left -expand yes -padx 5 -pady 5
+    pack $w.bot.left -side left -expand yes -ipadx 2 -ipady 2 -padx 5 -pady 5
     button $w.bot.left.ok -width 6 -text {Ok} \
             -command ${ok-action}
-    pack $w.bot.left.ok -expand yes -padx 3 -pady 3
+    pack $w.bot.left.ok -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3
     button $w.bot.cancel -width 6 -text {Cancel} \
-            -command "destroy $w"
+            -command [list destroy $w]
     pack $w.bot.cancel -side left -expand yes    
 
     if {$g} {
+        grab $w
+        tkwait window $w
+    }
+}
+
+proc bottom-buttons {w buttonList g} {
+    set i 0
+    set l [llength $buttonList]
+
+    frame $w.bot.$i -relief sunken -border 1
+    pack $w.bot.$i -side left -expand yes -padx 5 -pady 5
+    button $w.bot.$i.ok -text [lindex $buttonList $i] \
+            -command [lindex $buttonList [expr $i+1]]
+    pack $w.bot.$i.ok -expand yes -ipadx 3 -ipady 2 -padx 3 -pady 3 -side left
+
+    incr i 2
+    while {$i < $l} {
+        button $w.bot.$i -text [lindex $buttonList $i] \
+                -command [lindex $buttonList [expr $i+1]]
+        pack $w.bot.$i -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
+        incr i 2
+    }
+    if {$g} {
         # Grab ...
         grab $w
         tkwait window $w
     }
 }
 
+proc cancel-operation {} {
+    global cancelFlag
+    global busy
+
+    set cancelFlag 1
+    if {$busy} {
+        show-status Cancelled 0 {}
+    }
+}
+
 proc show-target {target} {
-    .bot.target configure -text "$target"
+    .bot.a.target configure -text "$target"
 }
 
-proc show-busy {v1 v2} {
+proc show-logo {v1} {
     global busy
     if {$busy != 0} {
-        .bot.status configure -fg $v1
-        after 200 [list show-busy $v2 $v1]
+        incr v1 -1
+        if {$v1==0} {
+            set v1 9
+        }
+        .bot.logo configure -bitmap @book${v1}
+        after 140 [list show-logo $v1]
+        return
+    }
+    while {1} {
+        .bot.logo configure -bitmap @book1
+        tkwait variable busy
+        if {$busy} {
+            show-logo 1
+            return
+        }
     }
 }
         
-proc show-status {status b} {
+proc show-status {status b sb} {
     global busy
-    global statusbg
-    .bot.status configure -text "$status"
-    .bot.status configure -fg black
-    if {$b != 0} {
-        if {$busy == 0} {
-            set busy $b   
-            show-busy red blue
+    global searchEnable
+
+    .bot.a.status configure -text "$status"
+    if {$b == 1} {
+        if {$busy == 0} {set busy 1}
+    } else {
+        set busy 0
+    }
+    if {$sb == {}} {
+        return
+    }
+    if {$sb} {
+        .top.service configure -state normal
+        .mid.search configure -state normal
+        .mid.scan configure -state normal
+        .mid.present configure -state normal
+        if {[winfo exists .scan-window]} {
+            .scan-window.bot.2 configure -state normal
+            .scan-window.bot.4 configure -state normal
         }
-        #        . config -cursor {watch black white}
+        set searchEnable 1
     } else {
-        #        . config -cursor {top_left_arrow black white}
-        puts "Normal"
+        .top.service configure -state disabled
+        .mid.search configure -state disabled
+        .mid.scan configure -state disabled
+        .mid.present configure -state disabled
+
+        if {[winfo exists .scan-window]} {
+            .scan-window.bot.2 configure -state disabled
+            .scan-window.bot.4 configure -state disabled
+        }
+        set searchEnable 0
     }
-    set busy $b
 }
 
 proc show-message {msg} {
-    .bot.message configure -text "$msg"
+    .bot.a.message configure -text "$msg"
 }
 
 proc insertWithTags {w text args} {
@@ -125,19 +363,133 @@ proc insertWithTags {w text args} {
     }
 }
 
-proc show-full-marc {no} {
-    global setNo
+proc popup-license {} {
+    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
+
+    set f [open "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
+
+    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.p.in -text "Implementation name: $i"
+    set i [z39 targetImplementationId]
+    label $w.top.p.ii -text "Implementation id: $i"
+    set i [z39 targetImplementationVersion]
+    label $w.top.p.iv -text "Implementation version: $i"
+    set i [z39 options]
+    label $w.top.p.op -text "Protocol options: $i"
+
+    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 destroy $w]] 1
+}
+
+proc about-origin-logo {n} {
+    set w .about-origin-w
+    if {![winfo exists $w]} {
+        return
+    }
+    incr n -1
+    if {$n==0} {
+        set n 9
+    }
+    $w.top.a.logo configure -bitmap @book$n
+    after 140 [list about-origin-logo $n]
+}
+
+proc about-origin {} {
+    set w .about-origin-w
+    
+    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
 
-    set w .full-marc
+    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 @book1 
+    pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
+
+    set i [z39 implementationName]
+    label $w.top.p.in -text "Implementation name: $i"
+    set i [z39 implementationId]
+    label $w.top.p.ii -text "Implementation id: $i"
+
+    pack $w.top.p.in $w.top.p.ii -side top -anchor nw
+
+    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
 
+    if {[z39.$sno type $no] != "DB"} {
+        return
+    }
+    if {$b} {
+        set w .full-marc-$fullMarcSeq
+        incr fullMarcSeq
+    } else {
+        set w .full-marc
+    }
     if {[winfo exists $w]} {
-        $w.top.record delete 0.0 end
         set new 0
     } else {
 
-        toplevel $w
+        toplevelG $w
 
-        wm minsize $w 200 200
+        wm minsize $w 0 0
         
         frame $w.top -relief raised -border 1
         frame $w.bot -relief raised -border 1
@@ -145,55 +497,70 @@ 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 12 -wrap word \
+        text $w.top.record -width 60 -height 5 -wrap word \
                 -yscrollcommand [list $w.top.s set]
         scrollbar $w.top.s -command [list $w.top.record yview]
 
+        if {[tk colormodel .] == "color"} {
+            $w.top.record tag configure marc-tag -foreground blue
+            $w.top.record tag configure marc-id -foreground red
+        } else {
+            $w.top.record tag configure marc-tag -foreground black
+            $w.top.record tag configure marc-id -foreground black
+        }
+        $w.top.record tag configure marc-data -foreground black
         set new 1
     }
-    incr no
-    
-    set r [z39.$setNo recordMarc $no line * * *]
+    $w.top.record delete 0.0 end
+    wm title $w "Record #$no"
 
-    $w.top.record tag configure marc-tag -foreground blue
-    $w.top.record tag configure marc-data -foreground black
-    $w.top.record tag configure marc-id -foreground red
+    set ffunc [lindex $displayFormats $df]
+    set ffunc "display-$ffunc"
 
-    foreach line $r {
-        set tag [lindex $line 0]
-        set indicator [lindex $line 1]
-        set fields [lindex $line 2]
+    $ffunc $sno $no $w.top.record 0
 
-        if {$indicator != ""} {
-            insertWithTags $w.top.record "$tag $indicator" marc-tag
-        } else {
-            insertWithTags $w.top.record "$tag    " marc-tag
-        }
-        foreach field $fields {
-            set id [lindex $field 0]
-            set data [lindex $field 1]
-            if {$id != ""} {
-                insertWithTags $w.top.record " $id " marc-id
-            }
-            set start [$w.top.record index insert]
-            insertWithTags $w.top.record $data {}
-        }
-        $w.top.record insert end "\n"
-    }
     if {$new} {
-        bind $w <Return> {destroy .full-marc}
+        bind $w.top.record <Return> {destroy .full-marc}
         
         pack $w.top.s -side right -fill y
         pack $w.top.record -expand yes -fill both
         
-        frame $w.bot.left -relief sunken -border 1
-        pack $w.bot.left -side left -expand yes -padx 5 -pady 5
-        button $w.bot.left.close -width 6 -text {Close} \
-                -command {destroy .full-marc}
-        pack $w.bot.left.close -expand yes -padx 3 -pady 3
-        button $w.bot.edit -width 6 -text {Edit} \
-                -command {destroy .full-marc}
-        pack $w.bot.edit -side left -expand yes
+        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
+        } else {
+            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
+        }
+    } else {
+        set i 0
+        foreach f $displayFormats {
+            $w.bot.formats.m entryconfigure $i \
+                    -command [list display-$f $sno $no $w.top.record 0]
+            incr i
+        }
     }
 }
 
@@ -202,7 +569,7 @@ proc update-target-hotlist {target} {
 
     set len [llength $hotTargets]
     if {$len > 0} {
-        .top.target.m delete 5 [expr 5+[llength $hotTargets]]
+        .top.target.m delete 6 [expr 6+[llength $hotTargets]]
     }
     set indx [lsearch $hotTargets $target]
     if {$indx >= 0} {
@@ -218,7 +585,7 @@ proc set-target-hotlist {} {
     set i 1
     foreach target $hotTargets {
         .top.target.m add command -label "$i $target" -command \
-                "menu-open-target $target {}"
+                [list reopen-target $target {}]
         incr i
         if {$i > 8} {
              break
@@ -226,14 +593,15 @@ proc set-target-hotlist {} {
     }
 }
 
-proc menu-open-target {target base} {
+proc reopen-target {target base} {
+    close-target
     open-target $target $base
     update-target-hotlist $target
 }
 
 proc define-target-action {} {
     global profile
-
+    
     set target [.target-define.top.target.entry get]
     if {$target == ""} {
         return
@@ -245,11 +613,20 @@ proc define-target-action {} {
             return
         }
     }
+    set seq [lindex $profile(Default) 12]
+    puts "seq=${seq}"
     set profile($target) $profile(Default)
+    set profile(Default) [lreplace $profile(Default) 12 12 [incr seq]]
+
     protocol-setup $target
     destroy .target-define
 }
 
+proc fail-response {target} {
+    close-target
+    tkerror "Target connection closed or protocol error"
+}
+
 proc connect-response {target} {
     puts "connect-response"
     show-target $target
@@ -258,59 +635,81 @@ proc connect-response {target} {
 
 proc open-target {target base} {
     global profile
+    global hostid
 
-    .top.target.m disable 0
-    .top.target.m enable 1
     z39 disconnect
     z39 comstack [lindex $profile($target) 6]
-    # z39 idAuthentication [lindex $profile($target) 3]
+    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
     if {$base == ""} {
         z39 databaseNames [lindex [lindex $profile($target) 7] 0]
     } else {
         z39 databaseNames $base
     }
-    show-status {Connecting} 1
+    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 {}
+    set hostid $target
+    .top.target.m disable 0
+    .top.target.m enable 1
+    .top.target.m enable 2
+}
+
+proc close-target {} {
+    global hostid
+    global cancelFlag
+
+    set cancelFlag 0
+    set hostid Default
+    z39 disconnect
+    show-target {}
+    show-status {Not connected} 0 0
+    show-message {}
+    .top.target.m disable 1
+    .top.target.m disable 2
+    .top.target.m enable 0
 }
 
 proc load-set-action {} {
     global setNo
 
     incr setNo
-    ir-set z39.$setNo
+    ir-set z39.$setNo z39
 
     set fname [.load-set.top.filename.entry get]
     destroy .load-set
     if {$fname != ""} {
-        init-title-lines
-
-        show-status {Loading} 1
+        show-status {Loading} 1 {}
+        update
         z39.$setNo loadFile $fname
 
         set no [z39.$setNo numberOfRecordsReturned]
         add-title-lines $setNo $no 1
     }
-    show-status {Ready} 0
+    set l [format "%-4d %7d" $setNo $no]
+    .top.rset.m add command -label $l \
+            -command [list add-title-lines $setNo 10000 1]
+    show-status {Ready} 0 {}
 }
 
 proc load-set {} {
     set w .load-set
 
+    set oldFocus [focus]
     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} \
@@ -318,45 +717,313 @@ proc load-set {} {
             {load-set-action} {destroy .load-set}
     
     top-down-ok-cancel $w {load-set-action} 1
+    focus $oldFocus
 }
 
 proc init-request {} {
     global setNo
-    
+    global cancelFlag
+
+    if {$cancelFlag} {
+        close-target
+        return
+    }
     z39 callback {init-response}
+    show-status {Initializing} 1 {}
     z39 init
-    show-status {Initializing} 1
-    set setNo 0
 }
 
 proc init-response {} {
-    show-status {Ready} 0
-    bind .mid.searchentry <Return> search-request
-    focus .mid.searchentry
+    global cancelFlag
+
+    if {$cancelFlag} {
+        close-target
+        return
+    }
+    show-status {Ready} 0 1
+    if {![z39 initResult]} {
+        set u [z39 userInformationField]
+        close-target
+        tkerror "Connection rejected by target: $u"
+    }
 }
 
 proc search-request {} {
     global setNo
+    global profile
+    global hostid
+    global busy
+    global cancelFlag
+    global searchEnable
+
+    set target $hostid
 
+    if {$searchEnable == 0} {
+        return
+    }
+    set query [index-query]
+    if {$query==""} {
+        return
+    }
     incr setNo
-    ir-set z39.$setNo
+    ir-set z39.$setNo z39
 
+    if {[lindex $profile($target) 10] == 1} {
+        z39.$setNo setName $setNo
+        puts "setName=${setNo}"
+    } else {
+        z39.$setNo setName Default
+        puts "setName=Default"
+    }
+    if {[lindex $profile($target) 8] == 1} {
+        z39.$setNo queryType rpn
+    }
+    if {[lindex $profile($target) 9] == 1} {
+        z39.$setNo queryType ccl
+    }
     z39 callback {search-response}
-    z39.$setNo search [.mid.searchentry get]
-    show-status {Search} 1
+    z39.$setNo search $query
+    show-status {Search} 1 0
+}
+
+proc scan-request {} {
+    set w .scan-window
+
+    global profile
+    global hostid
+    global scanView
+    global scanTerm
+    global curIndexEntry
+    global queryButtonsFind
+    global queryInfoFind
+
+    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"
+    }
+    ir-scan z39.scan z39
+
+    if {![winfo exists $w]} {
+        toplevelG $w
+        
+        wm title $w "Scan"
+        
+        wm minsize $w 0 0
+
+        top-down-window $w
+
+        entry $w.top.entry -relief sunken 
+        pack $w.top.entry -fill x -padx 4 -pady 2
+        bind $w.top.entry <KeyRelease> [list scan-term-h $attr]
+        if {1} {
+            listbox $w.top.list -yscrollcommand [list $w.top.scroll set] \
+                    -font fixed 
+            scrollbar $w.top.scroll -orient vertical -border 1
+            pack $w.top.list -side left -fill both -expand yes
+            pack $w.top.scroll -side right -fill y
+            $w.top.scroll config -command [list $w.top.list yview]
+        } else {
+            listbox $w.top.list -font fixed -geometry 60x14
+            pack $w.top.list -side left -fill both -expand yes
+        }
+        
+        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]
+    }
+    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
+}
+
+proc scan-term-h {attr} {
+    global busy
+    global scanTerm
+
+    if {$busy} {
+        return
+    }
+    set w .scan-window
+    set nScanTerm [$w.top.entry get]
+    if {$nScanTerm == $scanTerm} {
+        return
+    }
+    set scanTerm $nScanTerm
+    z39 callback [list scan-response $attr 0 35]
+    z39.scan numberOfTermsRequested 5
+    z39.scan preferredPositionInResponse 1
+    puts "${attr} \{${scanTerm}\}"
+    if {$scanTerm == ""} {
+        z39.scan scan "${attr} 0"
+    } else {
+        z39.scan scan "${attr} \{${scanTerm}\}"
+    }
+    show-status {Scan} 1 0
+}
+
+proc scan-response {attr start toget} {
+    global cancelFlag
+    global scanTerm
+    global scanView
+
+    set w .scan-window
+    puts "In scan-response"
+    set m [z39.scan numberOfEntriesReturned]
+    puts $m
+    puts attr=$attr
+    puts start=$start
+    puts toget=$toget
+
+    if {![winfo exists .scan-window]} {
+        show-status {Ready} 0 1
+        set cancelFlag 0
+        return
+    }
+    set nScanTerm [$w.top.entry get]
+    if {$nScanTerm != $scanTerm} {
+        z39 callback [list scan-response $attr 0 35]
+        z39.scan numberOfTermsRequested 5
+        z39.scan preferredPositionInResponse 1
+        set scanTerm $nScanTerm
+        puts "${attr} \{${scanTerm}\}"
+        if {$scanTerm == ""} {
+            z39.scan scan "${attr} 0"
+        } else {
+            z39.scan scan "${attr} \{${scanTerm}\}"
+        }
+        show-status {Scan} 1 0
+        return
+    }
+    set status [z39.scan scanStatus]
+    if {$status == 6} {
+        tkerror "Scan fail"
+        show-status {Ready} 0 1
+        set cancelFlag 0
+        return
+    }
+    if {$toget < 0} {
+        for {set i 0} {$i < $m} {incr i} {
+            set term [lindex [z39.scan scanLine $i] 1]
+            set nostr [format " %-6d" [lindex [z39.scan scanLine $i] 2]]
+            $w.top.list insert $i "$nostr $term"
+        }
+        incr scanView $m
+        $w.top.list yview $scanView
+    } else {
+        $w.top.list delete $start end
+        for {set i 0} {$i < $m} {incr i} {
+            set term [lindex [z39.scan scanLine $i] 1]
+            set nostr [format " %-6d" [lindex [z39.scan scanLine $i] 2]]
+            $w.top.list insert end "$nostr $term"
+        }
+    }
+    if {$cancelFlag} {
+        show-status {Ready} 0 1
+        set cancelFlag 0
+        return
+    }
+    if {$toget > 0 && $m > 1 && $m < $toget} {
+        set ntoget [expr $toget - $m + 1]
+        puts ntoget=$ntoget
+        z39 callback [list scan-response $attr [expr $start + $m - 1] $ntoget]
+        set q $term
+        puts "down continue: $q"
+        if {$ntoget > 10} {
+            z39.scan numberOfTermsRequested 10
+        } else {
+            z39.scan numberOfTermsRequested $ntoget
+        }
+        z39.scan preferredPositionInResponse 1
+        puts "${attr} \{$q\}"
+        z39.scan scan "${attr} \{$q\}"
+        return
+    }
+    if {$toget < 0 && $m > 1 && $m < [expr - $toget]} {
+        set ntoget [expr - $toget - $m]
+        puts ntoget=$ntoget
+        z39 callback [list scan-response $attr 0 -$ntoget]
+        set q [string range [$w.top.list get 0] 8 end]
+        puts "up continue: $q"
+        if {$ntoget > 10} {
+            z39.scan numberOfTermsRequested 10
+            z39.scan preferredPositionInResponse 11
+        } else {
+            z39.scan numberOfTermsRequested $ntoget
+            z39.scan preferredPositionInResponse [incr ntoget]
+        }
+        puts "${attr} \{$q\}"
+        z39.scan scan "${attr} \{$q\}"
+        return
+    }
+    show-status {Ready} 0 1
+}
+
+proc scan-down {attr} {
+    global scanView
+
+    set w .scan-window
+    set scanView [expr $scanView + 5]
+    set s [$w.top.list size]
+    if {$scanView > $s} {
+        z39 callback [list scan-response $attr [expr $s - 1] 25]
+        set q [string range [$w.top.list get [expr $s - 1]] 8 end]
+        puts "down: $q"
+        z39.scan numberOfTermsRequested 10
+        z39.scan preferredPositionInResponse 1
+        show-status {Scan} 1 0
+        puts "${attr} \{$q\}"
+        z39.scan scan "${attr} \{$q\}"
+        return
+    }
+    $w.top.list yview $scanView
+}
+
+proc scan-up {attr} {
+    global scanView
+
+    set w .scan-window
+    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"
+        z39.scan numberOfTermsRequested 10
+        z39.scan preferredPositionInResponse 11
+        show-status {Scan} 1 0
+        z39.scan scan "${attr} \{$q\}"
+        return
+    }
+    $w.top.list yview $scanView
 }
 
 proc search-response {} {
     global setNo
     global setOffset
     global setMax
+    global cancelFlag
+    global busy
 
+    puts "In search-response"
     init-title-lines
-    show-status {Ready} 0
-    show-message "[z39.$setNo resultCount] hits"
+    show-status {Ready} 0 1
     set setMax [z39.$setNo resultCount]
-    puts $setMax
-    if {$setMax == 0} {
+    show-message "${setMax} hits"
+    set l [format "%-4d %7d" $setNo $setMax]
+    .top.rset.m add command -label $l \
+            -command [list add-title-lines $setNo 10000 1]
+    if {$setMax <= 0} {
         set status [z39.$setNo responseStatus]
         if {[lindex $status 0] == "NSD"} {
             set code [lindex $status 1]
@@ -366,52 +1033,131 @@ proc search-response {} {
         }
         return
     }
-    if {$setMax > 10} {
-        set setMax 10
+    if {$setMax > 20} {
+        set setMax 20
     }
-    z39 callback {present-response}
     set setOffset 1
-    z39.$setNo present 1 $setMax
-    show-status {Retrieve} 1
-}
-
-proc init-title-lines {} {
-    .data.list delete 0 end
-}
-
-proc add-title-lines {setno no offset} {
-    for {set i 0} {$i < $no} {incr i} {
-        set o [expr $i + $offset]
-        set title [lindex [z39.$setno recordMarc $o field 245 * a] 0]
-        set year  [lindex [z39.$setno recordMarc $o field 260 * c] 0]
-        set nostr [format "%3d" $o]
-        .data.list insert end "$nostr $title - $year"
+    if {$cancelFlag} {
+        set cancelFlag 0
+        return
     }
+    z39 callback {present-response}
+    z39.$setNo present $setOffset 1
+    show-status {Retrieve} 1 0
 }
 
-proc present-response {} {
+proc present-more {number} {
     global setNo
     global setOffset
     global setMax
 
-    puts "In present-response"
-    set no [z39.$setNo numberOfRecordsReturned]
-    puts "Returned $no records, setOffset $setOffset"
-    add-title-lines $setNo $no $setOffset
-    set setOffset [expr $setOffset + $no]
-    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"
+    puts "setOffset=$setOffset"
+    puts "present-more"
+    if {$setNo == 0} {
+        puts "setNo=$setNo"
+	return
+    }
+    set max [z39.$setNo resultCount]
+    if {$max <= $setOffset} {
+        puts "max=$max"
+        puts "setOffset=$setOffset"
         return
     }
-    if {$no > 0 && $setOffset <= $setMax} {
-        z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
+    if {$number == ""} {
+        set setMax $max
     } else {
-        show-status {Finished} 0
+        incr setMax $number
+        if {$setMax > $max} {
+            set setMax $max
+        }
+    }
+    z39 callback {present-response}
+
+    set toGet [expr $setMax - $setOffset + 1]
+    if {$toGet <= 0} {
+        return
+    }
+    if {$toGet > 3} {
+        set toGet 3
+    } 
+    z39.$setNo present $setOffset $toGet
+    show-status {Retrieve} 1 0
+}
+
+proc init-title-lines {} {
+    .data.record delete 0.0 end
+}
+
+proc title-press {y setno} {
+    show-full-marc $setno [expr 1 + [.data.list nearest $y]] 0
+}
+
+proc add-title-lines {setno no offset} {
+    global displayFormats
+    global displayFormat
+    global lastSetNo
+
+    if {$setno == 0} {
+        set setno $lastSetNo
+    } else {
+        set lastSetNo $setno
+    }
+    if {$offset == 1} {
+        .bot.a.set configure -text $setno
+        .data.record delete 0.0 end
+    }
+    set ffunc [lindex $displayFormats $displayFormat]
+    set ffunc "display-$ffunc"
+    for {set i 0} {$i < $no} {incr i} {
+        set o [expr $i + $offset]
+        set type [z39.$setno type $o]
+        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 0]
+    }
+}
+
+proc present-response {} {
+    global setNo
+    global setOffset
+    global setMax
+    global cancelFlag
+
+    puts "In present-response"
+    set no [z39.$setNo numberOfRecordsReturned]
+    puts "Returned $no records, setOffset $setOffset"
+    add-title-lines $setNo $no $setOffset
+    set setOffset [expr $setOffset + $no]
+    set status [z39.$setNo responseStatus]
+    if {[lindex $status 0] == "NSD"} {
+        show-status {Ready} 0 1
+        set code [lindex $status 1]
+        set msg [lindex $status 2]
+        set addinfo [lindex $status 3]
+        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}"
+        set toGet [expr $setMax - $setOffset + 1]
+        if {$toGet > 3} {
+            set toGet 3
+        }
+        z39.$setNo present $setOffset $toGet
+    } else {
+        show-status {Finished} 0 1
     }
 }
 
@@ -466,64 +1212,67 @@ proc define-target-dialog {} {
     set w .target-define
 
     toplevel $w
-
     place-force $w .
-
     top-down-window $w
-
     frame $w.top.target
-
     pack $w.top.target \
             -side top -anchor e -pady 2 
-
     entry-fields $w.top {target} \
             {{Target:}} \
             {define-target-action} {destroy .target-define}
-    
     top-down-ok-cancel $w {define-target-action} 1
 }
 
-proc close-target {} {
-    # pack forget .mid.searchlabel .mid.searchentry
-    #.mid.searchentry -state disabled
-    z39 disconnect
-    show-target {None}
-    show-status {Not connected} 0
-    show-message {}
-    .top.target.m disable 1
-    .top.target.m enable 0
+proc protocol-setup-delete {target} {
+    global profile
+
+    set a [alert "Are you 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)
+        cascade-target-list
+    }
 }
 
 proc protocol-setup-action {target} {
     global profile
     global csRadioType
+    global protocolRadioType
     global settingsChanged
+    global RPNCheck
+    global CCLCheck
+    global ResultSetCheck
 
-    set w .setup-${target}.top
-
-    #set w .protocol-setup.top
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
     
     set b {}
     set settingsChanged 1
-    set len [$w.databases.list size]
+    set len [$w.top.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] \
+        lappend b [$w.top.databases.list get $i]
+    }
+    set profile($target) [list [$w.top.description.entry get] \
+            [$w.top.host.entry get] \
+            [$w.top.port.entry get] \
+            [$w.top.idAuthentication.entry get] \
+            [$w.top.maximumRecordSize.entry get] \
+            [$w.top.preferredMessageSize.entry get] \
             $csRadioType \
-            $b]
+            $b \
+            $RPNCheck \
+            $CCLCheck \
+            $ResultSetCheck \
+            $protocolRadioType \
+            $wno]
 
     cascade-target-list
     puts $profile($target)
-    destroy .setup-${target}
+    destroy $w
 }
 
-
 proc place-force {window parent} {
     set g [wm geometry $parent]
 
@@ -535,22 +1284,27 @@ proc place-force {window parent} {
     wm geometry $window +${x}+${y}
 }
 
-
 proc add-database-action {target} {
-    set w .setup-${target}
-    
-    ${w}.top.databases.list insert end \
+    global profile
+
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
+
+    $w.top.databases.list insert end \
             [.database-select.top.database.entry get]
     destroy .database-select
 }
 
 proc add-database {target} {
+    global profile
+
     set w .database-select
 
     set oldFocus [focus]
     toplevel $w
-
-    place-force $w .setup-${target}
+ 
+    set wno [lindex $profile($target) 12]
+    place-force $w .setup-${wno}
 
     top-down-window $w
 
@@ -567,8 +1321,11 @@ proc add-database {target} {
 }
 
 proc delete-database {target} {
-    set w .setup-${target}
-    
+    global profile
+
+    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
@@ -576,15 +1333,19 @@ proc delete-database {target} {
 }
 
 proc protocol-setup {target} {
-    set w .setup-$target
-
     global profile
     global csRadioType
+    global protocolRadioType
+    global RPNCheck
+    global CCLCheck
+    global ResultSetCheck
 
-    toplevel $w
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
+
+    toplevelG $w
 
     wm title $w "Setup $target"
-    place-force $w .
 
     top-down-window $w
     
@@ -601,6 +1362,7 @@ proc protocol-setup {target} {
     frame $w.top.maximumRecordSize
     frame $w.top.preferredMessageSize
     frame $w.top.cs-type -relief ridge -border 2
+    frame $w.top.protocol -relief ridge -border 2
     frame $w.top.query -relief ridge -border 2
     frame $w.top.databases -relief ridge -border 2
 
@@ -611,15 +1373,15 @@ proc protocol-setup {target} {
     
     entry-fields $w.top {description host port idAuthentication \
             maximumRecordSize preferredMessageSize} \
-            {{Description:} {Host:} {Port:} {Id Authentification:} \
+            {{Description:} {Host:} {Port:} {Id Authentication:} \
             {Maximum Record Size:} {Preferred Message Size:}} \
             [list protocol-setup-action $target] [list destroy $w]
     
     foreach sub {description host port idAuthentication \
             maximumRecordSize preferredMessageSize} {
         puts $sub
-        bind $w.top.$sub.entry <Control-a> "add-database $target"
-        bind $w.top.$sub.entry <Control-d> "delete-database $target"
+        bind $w.top.$sub.entry <Control-a> [list add-database $target]
+        bind $w.top.$sub.entry <Control-d> [list delete-database $target]
     }
     $w.top.description.entry insert 0 [lindex $profile($target) 0]
     $w.top.host.entry insert 0 [lindex $profile($target) 1]
@@ -627,15 +1389,23 @@ proc protocol-setup {target} {
     $w.top.idAuthentication.entry insert 0 [lindex $profile($target) 3]
     $w.top.maximumRecordSize.entry insert 0 [lindex $profile($target) 4]
     $w.top.preferredMessageSize.entry insert 0 [lindex $profile($target) 5]
+    set csRadioType [lindex $profile($target) 6]
+    set RPNCheck [lindex $profile($target) 8]
+    set CCLCheck [lindex $profile($target) 9]
+    set ResultSetCheck [lindex $profile($target) 10]
+    set protocolRadioType [lindex $profile($target) 11]
+    if {$protocolRadioType == ""} {
+        set protocolRadioType z39v2
+    }
 
     # Databases ....
-    pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
+    pack $w.top.databases -side left -pady 4 -padx 4 -expand yes -fill both
 
     label $w.top.databases.label -text "Databases"
     button $w.top.databases.add -text "Add" \
-            -command "add-database $target"
+            -command [list add-database $target]
     button $w.top.databases.delete -text "Delete" \
-            -command "delete-database $target"
+            -command [list 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
@@ -652,34 +1422,47 @@ proc protocol-setup {target} {
     foreach b [lindex $profile($target) 7] {
         $w.top.databases.list insert end $b
     }
-    
-    # Transport ...
-    set csRadioType [lindex $profile($target) 6]
 
-    pack $w.top.cs-type -pady 6 -padx 6 -side top
+    # Transport ...
+    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" \
+    radiobutton $w.top.cs-type.tcpip -text "TCP/IP" -anchor w \
             -command {puts tcp/ip} -variable csRadioType -value tcpip
-    radiobutton $w.top.cs-type.mosi -text "MOSI" \
+    radiobutton $w.top.cs-type.mosi -text "MOSI" -anchor w\
             -command {puts mosi} -variable csRadioType -value mosi
     
     pack $w.top.cs-type.label $w.top.cs-type.tcpip $w.top.cs-type.mosi \
             -padx 4 -side top -fill x
 
+    # Protocol ...
+    pack $w.top.protocol -pady 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
+    radiobutton $w.top.protocol.sr -text "SR" -anchor w \
+            -command {puts sr} -variable protocolRadioType -value sr
+    
+    pack $w.top.protocol.label $w.top.protocol.z39v2 $w.top.protocol.sr \
+            -padx 4 -side top -fill x
+
     # Query ...
-    pack $w.top.query -pady 6 -padx 6 -side top
+    pack $w.top.query -pady 4 -padx 4 -side top -fill x
 
-    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"
+    label $w.top.query.label -text "Query support"
+    checkbutton $w.top.query.c1 -text "RPN query" -anchor w -variable RPNCheck
+    checkbutton $w.top.query.c2 -text "CCL query" -anchor w -variable CCLCheck
+    checkbutton $w.top.query.c3 -text "Result sets" -anchor w -variable ResultSetCheck
 
     pack $w.top.query.label -side top 
     pack $w.top.query.c1 $w.top.query.c2 $w.top.query.c3 \
             -padx 4 -side top -fill x
 
-    top-down-ok-cancel $w [list protocol-setup-action $target] 0
+    # Ok-cancel
+    bottom-buttons $w [list {Ok} [list protocol-setup-action $target] \
+            {Delete} [list protocol-setup-delete $target] \
+            {Cancel} [list destroy $w]] 0   
 }
 
 proc database-select-action {} {
@@ -705,10 +1488,6 @@ proc database-select {} {
 
     top-down-window $w
 
-    if {$hostid == ""} {
-        set hostid Default
-    }
-
     frame $w.top.databases -relief ridge -border 2
 
     pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
@@ -735,7 +1514,6 @@ 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
@@ -748,11 +1526,11 @@ proc cascade-target-list {} {
                 menu .top.target.m.clist.$nl
                 foreach b [lindex $profile($n) 7] {
                     .top.target.m.clist.$nl add command -label $b \
-                            -command "menu-open-target $n $b"
+                            -command [list reopen-target $n $b]
                 }
             } else {
                 .top.target.m.clist add command -label $n \
-                        -command "menu-open-target $n {}"
+                        -command [list reopen-target $n {}]
             }
         }
     }
@@ -760,25 +1538,154 @@ proc cascade-target-list {} {
     foreach n [array names profile] {
         if {$n != "Default"} {
             .top.target.m.slist add command -label $n \
-                    -command "protocol-setup $n"
+                    -command [list protocol-setup $n]
         }
     }
 }
 
+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
+    $w.slist delete 0 last
+    foreach n $queryTypes {
+        $w.slist add command -label $n -command [list query-setup $i]
+        incr i
+    }
+
+    set i 0
+    $w.clist delete 0 last
+    foreach n $queryTypes {
+        $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
+    
+    set windowGeometry(.) [wm geometry .]
+
+    set f [open "clientg.tcl" w]
+
+    foreach n [array names windowGeometry] {
+        puts -nonewline $f "set \{windowGeometry($n)\} \{"
+        puts -nonewline $f $windowGeometry($n)
+        puts $f "\}"
+    }
+    close $f
+}
+
 proc save-settings {} {
     global hotTargets 
     global profile
     global settingsChanged
-
-    set f [open "~/.tk-c" w]
+    global queryTypes
+    global queryButtons
+    global queryInfo
+    
+    set f [open "clientrc.tcl" w]
     puts $f "# Setup file"
     puts $f "set hotTargets \{ $hotTargets \}"
 
     foreach n [array names profile] {
-        puts -nonewline $f "set profile($n) \{"
+        puts -nonewline $f "set \{profile($n)\} \{"
         puts -nonewline $f $profile($n)
         puts $f "\}"
     }
+    puts -nonewline $f "set queryTypes \{" 
+    puts -nonewline $f $queryTypes
+    puts $f "\}"
+    
+    puts -nonewline $f "set queryButtons \{" 
+    puts -nonewline $f $queryButtons
+    puts $f "\}"
+    
+    puts -nonewline $f "set queryInfo \{"
+    puts -nonewline $f $queryInfo
+    puts $f "\}"
     close $f
     set settingsChanged 0
 }
@@ -792,9 +1699,10 @@ 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
 
-    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
@@ -816,21 +1724,705 @@ proc exit-action {} {
             save-settings
         }
     }
-    destroy .
+    save-geometry
+    exit 0
+}
+
+proc listbuttonaction {w name h user i} {
+    $w configure -text [lindex $name 0]
+    $h [lindex $name 1] $user $i
+}
+    
+proc listbuttonx {button no names handle user} {
+    if {[winfo exists $button]} {
+        $button configure -text [lindex [lindex $names $no] 0]
+        ${button}.m delete 0 last
+    } else {
+        menubutton $button -text [lindex [lindex $names $no] 0] \
+                -width 10 -menu ${button}.m -relief raised -border 1
+        menu ${button}.m
+    }
+    set i 0
+    foreach name $names {
+        ${button}.m add command -label [lindex $name 0] \
+                -command [list listbuttonaction ${button} $name \
+                $handle $user $i]
+        incr i
+    }
+}
+
+proc listbutton {button no names} {
+    menubutton $button -text [lindex $names $no] -width 10 -menu ${button}.m \
+            -relief raised -border 1
+    menu ${button}.m
+    foreach name $names {
+        ${button}.m add command -label $name \
+                -command [list ${button} configure -text $name]
+    }
+}
+
+proc listbuttonv-action {button var names i} {
+    global $var
+
+    set $var [lindex $names [expr $i+1]]
+    $button configure -text [lindex $names $i]
+}
+
+proc listbuttonv {button var names} {
+    global $var
+
+    set n "-"
+    eval "set val $$var"
+    set l [llength $names]
+    for {set i 1} {$i < $l} {incr i 2} {
+        if {$val == [lindex $names $i]} {
+            incr i -1
+            set n [lindex $names $i]
+            break
+        }
+    }
+    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} {
+        ${button}.m add command -label [lindex $names $i] \
+                -command [list listbuttonv-action $button $var $names $i]
+    }
+}
+
+proc query-add-index-action {queryNo} {
+    set w .query-setup
+
+    global queryInfoTmp
+    global queryButtonsTmp
+
+    set newI [.query-add-index.top.index.entry get]
+    lappend queryInfoTmp [list $newI {}]
+    $w.top.index insert end $newI
+    destroy .query-add-index
+    #destroy $w.top.lines
+    #frame $w.top.lines -relief ridge -border 2
+    index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+    #pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+}
+
+proc query-add-line {queryNo} {
+    set w .query-setup
+
+    global queryInfoTmp
+    global queryButtonsTmp
+
+    lappend queryButtonsTmp {I 0}
+
+    #destroy $w.top.lines
+    #frame $w.top.lines -relief ridge -border 2
+    index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+    #pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+}
+
+proc query-del-line {queryNo} {
+    set w .query-setup
+
+    global queryInfoTmp
+    global queryButtonsTmp
+
+    set l [llength $queryButtonsTmp]
+    if {$l <= 0} {
+        return
+    }
+    incr l -1
+    set queryButtonsTmp [lreplace $queryButtonsTmp $l $l]
+    index-lines $w.top.lines 0 $queryButtonsTmp $queryInfoTmp activate-e-index
+}
+
+proc query-add-index {queryNo} {
+    set w .query-add-index
+
+    toplevel $w
+    place-force $w .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] [list destroy $w]
+    top-down-ok-cancel $w [list query-add-index-action $queryNo] 1
+}
+
+proc query-setup-action {queryNo} {
+    global queryButtons
+    global queryInfo
+    global queryButtonsTmp
+    global queryInfoTmp
+    global settingsChanged 
+
+    set settingsChanged 1
+
+    set queryInfo [lreplace $queryInfo $queryNo $queryNo \
+            $queryInfoTmp]
+    set queryButtons [lreplace $queryButtons $queryNo $queryNo \
+            $queryButtonsTmp]
+    destroy .query-setup
+}
+
+proc activate-e-index {value no i} {
+    global queryButtonsTmp
+    global queryIndexTmp
+    
+    set queryButtonsTmp [lreplace $queryButtonsTmp $no $no [list I $i]]
+    puts $queryButtonsTmp
+    set queryIndexTmp $i
+}
+
+proc activate-index {value no i} {
+    global queryButtonsFind
+
+    set queryButtonsFind [lreplace $queryButtonsFind $no $no [list I $i]]
+
+    puts "queryButtonsFind $queryButtonsFind"
+}
+
+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]
+        puts "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
+
+    use-attr 0
+
+    puts "index-setup-action"
+    puts "queryNo $queryNo"
+    puts "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"
+    }
+    puts "new attr $attr"
+    set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
+    destroy .index-setup
+}
+
+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 }
+            }
+        }
+    }
+    toplevelG $w
+
+    set n [lindex $attr 0]
+    wm title $w "Index setup $n"
+
+    top-down-window $w
+
+    frame $w.top.use -relief ridge -border 2
+    frame $w.top.relation -relief ridge -border 2
+    frame $w.top.position -relief ridge -border 2
+    frame $w.top.structure -relief ridge -border 2
+    frame $w.top.truncation -relief ridge -border 2
+    frame $w.top.completeness -relief ridge -border 2
+
+    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 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 \
+            -padx 2 -pady 2
+    pack $w.top.use.list -side left -fill both -expand yes \
+            -padx 2 -pady 2
+    pack $w.top.use.scroll -side right -fill y \
+            -padx 2 -pady 2
+    $w.top.use.scroll config -command "$w.top.use.list yview"
+
+    use-attr 1
+
+    # Relation Attributes
+
+    pack $w.top.relation -pady 6 -padx 6 -side top
+    label $w.top.relation.label -text "Relation" -width 18
+    
+    pack $w.top.relation.label $w.top.relation.b -fill x 
+
+    # Position Attributes
+
+    pack $w.top.position -pady 6 -padx 6 -side top
+    label $w.top.position.label -text "Position" -width 18
+
+    pack $w.top.position.label $w.top.position.b -fill x
+
+    # Structure Attributes
+
+    pack $w.top.structure -pady 6 -padx 6 -side top
+    label $w.top.structure.label -text "Structure" -width 18
+
+    pack $w.top.structure.label $w.top.structure.b -fill x
+
+    # Truncation Attributes
+
+    pack $w.top.truncation -pady 6 -padx 6 -side top
+    label $w.top.truncation.label -text "Truncation" -width 18
+
+    pack $w.top.truncation.label $w.top.truncation.b -fill x
+
+    # Completeness Attributes
+
+    pack $w.top.completeness -pady 6 -padx 6 -side top
+    label $w.top.completeness.label -text "Completeness" -width 18
+
+    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 i [lindex [.query-setup.top.index curselection] 0]
+    if {$i == ""} {
+        return
+    }
+    set attr [lindex $queryInfoTmp $i]
+    puts "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 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 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]
+
+    toplevel $w
+
+    wm minsize $w 0 0
+    wm title $w "Query setup $queryName"
+
+    top-down-window $w
+
+    frame $w.top.lines -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
+
+    # Indexes
+
+    listbox $w.top.index -yscrollcommand [list $w.top.scroll set]
+    scrollbar $w.top.scroll -orient vertical -border 1 \
+        -command [list $w.top.index yview]
+
+    pack $w.top.index -side left -fill both -expand yes -padx 2 -pady 2
+    pack $w.top.scroll -side right -fill y -padx 2 -pady 2
+
+    $w.top.index select from 0
+    $w.top.index select to 0
+
+    foreach x $queryInfoTmp {
+        $w.top.index insert end [lindex $x 0]
+    }
+    # Ok-cancel
+    bottom-buttons $w [list \
+            {Ok} [list query-setup-action $queryNo] \
+            {Add line} [list query-add-line $queryNo] \
+            {Delete line} [list query-del-line $queryNo] \
+            {Add index} [list query-add-index $queryNo] \
+            {Edit index} [list query-edit-index $queryNo] \
+            {Delete index} [list query-delete-index $queryNo] \
+            {Cancel} [list destroy $w]] 0
+}
+
+proc index-clear {} {
+    global queryButtonsFind
+
+    set i 0
+    foreach b $queryButtonsFind {
+        .lines.$i.e delete 0 end
+        incr i
+    }
+}
+    
+proc index-query {} {
+    global queryButtonsFind
+    global queryInfoFind
+
+    set i 0
+    set qs {}
+
+    foreach b $queryButtonsFind {
+        set term [string trim [.lines.$i.e get]]
+        if {$term != ""} {
+            set attr [lrange [lindex $queryInfoFind [lindex $b 1]] 1 end]
+
+            set term "\{${term}\}"
+            foreach a $attr {
+                set term "@attr $a ${term}"
+            }
+            if {$qs != ""} {
+                set qs "@and ${qs} ${term}"
+            } else {
+                set qs $term
+            }
+        }
+        incr i
+    }
+    puts "qs=  $qs"
+    return $qs
+}
+
+proc index-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 {
+        if {! [winfo exists $w.$i]} {
+            frame $w.$i -background white -border 1
+        }
+        listbuttonx $w.$i.l [lindex $b 1] $queryInfo $handle $i
+
+        if {$realOp} {
+            if {! [winfo exists $w.$i.e]} {
+                entry $w.$i.e -width 32 -relief sunken -border 1
+                bind $w.$i.e <FocusIn> [list index-focus-in $w $i]
+                bind $w.$i.e <FocusOut> [list $w.$i configure \
+                        -background white]
+                pack $w.$i.l -side left
+                pack $w.$i.e -side left -fill x -expand yes
+                pack $w.$i -side top -fill x -padx 2 -pady 2
+                bind $w.$i.e <Left> [list left-cursor $w.$i.e]
+                bind $w.$i.e <Right> [list right-cursor $w.$i.e]
+                bind $w.$i.e <Return> search-request
+            }
+        } else {
+            pack $w.$i.l -side left
+            pack $w.$i -side top -fill x -padx 2 -pady 2
+        }
+        incr i
+    }
+    set j $i
+    while {[winfo exists $w.$j]} {
+        destroy $w.$j
+        incr j
+    }
+    if {! $realOp} {
+        return
+    }
+    set j 0
+    incr i -1
+    while {$j < $i} {
+        set k [expr $j+1]
+        bind $w.$j.e <Tab> "focus $w.$k.e"
+        set j $k
+    }
+    if {$i >= 0} {
+        bind $w.$i.e <Tab> "focus $w.0.e"
+        focus $w.0.e
+    }
 }
 
+proc search-fields {w buttondefs} {
+    set i 0
+    foreach buttondef $buttondefs {
+        frame $w.$i -background white
+        
+        listbutton $w.$i.l 0 $buttondef
+        entry $w.$i.e -width 32 -relief sunken
+        
+        pack $w.$i.l -side left
+        pack $w.$i.e -side left -fill x -expand yes
+
+        pack $w.$i -side top -fill x -padx 2 -pady 2
+
+        bind $w.$i.e <Left> [list left-cursor $w.$i.e]
+        bind $w.$i.e <Right> [list right-cursor $w.$i.e]
+
+        incr i
+    }
+    set j 0
+    incr i -1
+    while {$j < $i} {
+        set k [expr $j+1]
+        bind $w.$j.e <Tab> "focus $w.$k.e \n
+        $w.$k configure -background red \n
+        $w.$j configure -background white"
+        set j $k
+    }
+    bind $w.$i.e <Tab> "focus $w.0.e \n
+        $w.0 configure -background red \n
+        $w.$i configure -background white"
+    focus $w.0.e
+    $w.0 configure -background red
+}
+
+if {[info exists windowGeometry(.)]} {
+    set g $windowGeometry(.)
+    if {$g != ""} {
+        wm geometry . $g
+    }
+}    
+
+read-formats
+
 frame .top  -border 1 -relief raised
+frame .lines  -border 1 -relief raised
 frame .mid  -border 1 -relief raised
 frame .data -border 1 -relief raised
 frame .bot  -border 1 -relief raised
-pack .top .mid -side top -fill x
-pack .data      -side top -fill both -expand yes
-pack .bot      -fill x
+pack .top .lines .mid -side top -fill x
+pack .data -side top -fill both -expand yes
+pack .bot -fill x
 
 menubutton .top.file -text "File" -underline 0 -menu .top.file.m
 menu .top.file.m
 .top.file.m add command -label "Save settings" -command {save-settings}
-.top.file.m add command -label "Load Set" -command {load-set}
 .top.file.m add separator
 .top.file.m add command -label "Exit" -command {exit-action}
 
@@ -838,58 +2430,129 @@ menubutton .top.target -text "Target" -underline 0 -menu .top.target.m
 menu .top.target.m
 .top.target.m add cascade -label "Connect" -menu .top.target.m.clist
 .top.target.m add command -label "Disconnect" -command {close-target}
-#.top.target.m add command -label "Initialize" -command {init-request}
+.top.target.m add command -label "About" -command {about-target}
 .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
+.top.target.m disable 2
 
 menu .top.target.m.clist
 menu .top.target.m.slist
 cascade-target-list
 
-menubutton .top.database -text "Database" -underline 0 -menu .top.database.m
-menu .top.database.m
-.top.database.m add command -label "Select ..." -command {database-select}
-.top.database.m add command -label "Add ..." -command {puts "Add"}
+menubutton .top.service -text "Service" -underline 0 -menu .top.service.m
+menu .top.service.m
+.top.service.m add command -label "Database" -command {database-select}
+.top.service.m add cascade -label "Query type" -menu .top.service.m.querytype
+menu .top.service.m.querytype
+.top.service.m.querytype add radiobutton -label "RPN"
+.top.service.m.querytype add radiobutton -label "CCL"
+.top.service.m add cascade -label "Present" -menu .top.service.m.present
+menu .top.service.m.present
+.top.service.m.present add command -label "More" \
+        -command [list present-more 10]
+.top.service.m.present add command -label "All" \
+        -command [list present-more {}]
+.top.service configure -state disabled
+
+menubutton .top.rset -text "Set" -menu .top.rset.m
+menu .top.rset.m
+.top.rset.m add command -label "Load" -command {load-set}
+.top.rset.m add separator
+
+menubutton .top.options -text "Options" -underline 0 -menu .top.options.m
+menu .top.options.m
+.top.options.m add cascade -label "Query" -menu .top.options.m.query
+.top.options.m add cascade -label "Format" -menu .top.options.m.formats
+
+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.formats
+set i 0
+foreach f $displayFormats {
+    .top.options.m.formats add radiobutton -label $f -value $i \
+            -command [list set-display-format $i] -variable displayFormat
+    incr i
+}
 
 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"}
+.top.help.m add command -label "Help on help" \
+        -command {tkerror "Help on help not available. Sorry"}
+.top.help.m add command -label "About" -command {about-origin}
 
-pack .top.file .top.target .top.database -side left
+pack .top.file .top.target .top.service .top.rset .top.options -side left
 pack .top.help -side right
 
-label .mid.searchlabel -text {Search:}
-entry .mid.searchentry -width 32 -relief sunken
-pack .mid.searchlabel  -side left
-pack .mid.searchentry -side left -fill x -expand yes
+index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
+
+button .mid.search -width 7 -text {Search} -command search-request \
+        -state disabled
+button .mid.scan -width 7 -text {Scan} \
+        -command scan-request -state disabled 
+button .mid.present -width 7 -text {Present} -command [list present-more 10] \
+        -state disabled
 
-focus .mid.searchentry
-bind .mid.searchentry <Left> {left-cursor .mid.searchentry}
-bind .mid.searchentry <Right> {right-cursor .mid.searchentry}
+button .mid.clear -width 7 -text {Clear} -command index-clear
+pack .mid.search .mid.scan .mid.present .mid.clear -side left \
+        -fill y -padx 5 -pady 3
 
-listbox .data.list -yscrollcommand {.data.scroll set}
-scrollbar .data.scroll -orient vertical -border 1
-pack .data.list -side left -fill both -expand yes
+text .data.record -height 2 -width 20 -wrap none \
+        -yscrollcommand [list .data.scroll set]
+scrollbar .data.scroll -command [list .data.record yview]
 pack .data.scroll -side right -fill y
-.data.scroll config -command {.data.list yview}
+pack .data.record -expand yes -fill both
+initBindings
+
+if {[tk colormodel .] == "color"} {
+    .data.record tag configure marc-tag -foreground blue
+    .data.record tag configure marc-id -foreground red
+} else {
+    .data.record tag configure marc-tag -foreground black
+    .data.record tag configure marc-id -foreground black
+}
+.data.record tag configure marc-data -foreground black
+
+button .bot.logo  -bitmap @book1 -command cancel-operation
+frame .bot.a
+pack .bot.a -side left -fill x
+pack .bot.logo -side right -padx 2 -pady 2
 
-message .bot.target -text "None" -aspect 1000 -relief sunken -border 1
-label .bot.status -text "Not connected" -width 12 -relief \
+message .bot.a.target -text "" -aspect 1000 -border 1
+
+label .bot.a.status -text "Not connected" -width 15 -relief \
         sunken -anchor w -border 1
-label .bot.set -textvariable setNo -width 5 -relief \
+label .bot.a.set -text "" -width 5 -relief \
         sunken -anchor w -border 1
-label .bot.message -text "" -width 14 -relief \
+label .bot.a.message -text "" -width 15 -relief \
         sunken -anchor w -border 1
-pack .bot.target .bot.status .bot.set .bot.message -anchor nw \
+
+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 .data.list <Double-Button-1> {set indx [.data.list nearest %y]
-show-full-marc $indx}
+#bind . <Any-Enter> {focus .lines.0.e}
 
 ir z39
+
+#.top.options.m.formats invoke $displayFormat
+    
+show-logo 1
+