X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=client.tcl;h=a207c34b09f7458b605264ade3b3172f59d71a36;hb=b85034833b5ba67b267b22b539cf2bb93dc39775;hp=0d09798739bc6b41801288275f43aa6e4005e62b;hpb=c72152088563f058a22bacf0efeb0ca442dfaf8c;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index 0d09798..a207c34 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,27 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.37  1995-06-13 14:37:59  adam
+# 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.
@@ -131,6 +151,8 @@ set hotTargets {}
 set hotInfo {}
 set busy 0
 
+set libDir ""
+
 set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
 set hostid Default
 set settingsChanged 0
@@ -138,8 +160,11 @@ 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 queryTypes {Simple}
 set queryButtons { { {I 0} {I 1} {I 2} } }
@@ -147,6 +172,9 @@ 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]
@@ -157,15 +185,30 @@ proc read-formats {} {
     }
 }
 
+proc set-wrap {m} {
+    global textWrap
+
+    set textWrap $m
+    .data.record configure -wrap $m
+}
+
 proc set-display-format {f} {
     global displayFormat
     global setNo
+    global busy
 
     set displayFormat $f
     if {$setNo == 0} {
         return
     }
+    if {!$busy} {
+        .bot.a.status configure -text "Reformatting"
+    }
+    update idletasks
     add-title-lines 0 10000 1
+    if {!$busy} {
+        .bot.a.status configure -text "Ready"
+    }
 }
 
 proc initBindings {} {
@@ -189,6 +232,16 @@ proc initBindings {} {
     set w Listbox
     bind $w <B1-Motion> {}
     bind $w <Shift-B1-Motion> {}
+
+    set w Entry
+}
+
+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} {
@@ -273,7 +326,7 @@ proc cancel-operation {} {
 
     set cancelFlag 1
     if {$busy} {
-        show-status Cancelled 0 {}
+        show-status Canceling 0 {}
     }
 }
 
@@ -305,6 +358,9 @@ proc show-logo {v1} {
 proc show-status {status b sb} {
     global busy
     global searchEnable
+    global scanEnable
+    global setOffset
+    global setMax
 
     .bot.a.status configure -text "$status"
     if {$b == 1} {
@@ -318,8 +374,15 @@ 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 {$setOffset > 0 && $setOffset <= $setMax} {
+            .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
@@ -354,6 +417,32 @@ proc insertWithTags {w text args} {
     }
 }
 
+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
@@ -387,10 +476,26 @@ proc about-target {} {
     bottom-buttons $w [list {Close} [list destroy $w]] 1
 }
 
-proc about-origin {} {
+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]
+}
 
-    toplevelG $w
+proc about-origin {} {
+    set w .about-origin-w
+    
+    if {[winfo exists $w]} {
+        destroy $w
+    }
+    toplevel $w
 
     wm title $w "About IrTcl"
     place-force $w .
@@ -401,25 +506,29 @@ proc about-origin {} {
 
     pack $w.top.a $w.top.p -side top -fill x
     
-    label $w.top.a.about -text "About"
     label $w.top.a.irtcl -text "IrTcl" \
             -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
-    pack $w.top.a.about $w.top.a.irtcl -side top
+    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"
+    set i [z39 implementationVersion]
+    label $w.top.p.iv -text "Implementation version: $i"
 
-    pack $w.top.p.in $w.top.p.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 destroy $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
@@ -427,8 +536,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
@@ -459,12 +570,13 @@ proc popup-marc {sno no b df} {
         set new 1
     }
     $w.top.record delete 0.0 end
-    wm title $w "Record #$no"
+    set recordType [z39.$sno recordType $no]
+    wm title $w "$recordType record #$no"
 
     set ffunc [lindex $displayFormats $df]
     set ffunc "display-$ffunc"
 
-    $ffunc $sno $no  $w.top.record 0
+    $ffunc $sno $no $w.top.record 0
 
     if {$new} {
         bind $w.top.record <Return> {destroy .full-marc}
@@ -474,27 +586,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 destroy $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
             }
@@ -613,12 +715,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-status {Not connected} 0 0
+    init-title-lines
     show-message {}
     .top.target.m disable 1
     .top.target.m disable 2
@@ -635,6 +741,7 @@ proc load-set-action {} {
     destroy .load-set
     if {$fname != ""} {
         show-status {Loading} 1 {}
+        update
         z39.$setNo loadFile $fname
 
         set no [z39.$setNo numberOfRecordsReturned]
@@ -653,11 +760,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} \
@@ -683,16 +788,24 @@ proc init-request {} {
 
 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
     }
 }
 
@@ -715,6 +828,7 @@ proc search-request {} {
     }
     incr setNo
     ir-set z39.$setNo z39
+    z39.$setNo preferredRecordSyntax SUTRS
 
     if {[lindex $profile($target) 10] == 1} {
         z39.$setNo setName $setNo
@@ -731,7 +845,7 @@ proc search-request {} {
     }
     z39 callback {search-response}
     z39.$setNo search $query
-    show-status {Search} 1 0
+    show-status {Searching} 1 0
 }
 
 proc scan-request {} {
@@ -754,13 +868,12 @@ proc scan-request {} {
     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
@@ -785,15 +898,15 @@ proc scan-request {} {
                 {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]
     }
+    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} {
@@ -818,7 +931,7 @@ proc scan-term-h {attr} {
     } else {
         z39.scan scan "${attr} \{${scanTerm}\}"
     }
-    show-status {Scan} 1 0
+    show-status {Scanning} 1 0
 }
 
 proc scan-response {attr start toget} {
@@ -851,7 +964,7 @@ proc scan-response {attr start toget} {
         } else {
             z39.scan scan "${attr} \{${scanTerm}\}"
         }
-        show-status {Scan} 1 0
+        show-status {Scanning} 1 0
         return
     }
     set status [z39.scan scanStatus]
@@ -930,7 +1043,7 @@ proc scan-down {attr} {
         puts "down: $q"
         z39.scan numberOfTermsRequested 10
         z39.scan preferredPositionInResponse 1
-        show-status {Scan} 1 0
+        show-status {Scanning} 1 0
         puts "${attr} \{$q\}"
         z39.scan scan "${attr} \{$q\}"
         return
@@ -949,7 +1062,7 @@ proc scan-up {attr} {
         puts "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
     }
@@ -965,13 +1078,13 @@ proc search-response {} {
 
     puts "In search-response"
     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]
@@ -985,13 +1098,14 @@ proc search-response {} {
         set setMax 20
     }
     set setOffset 1
+    show-status {Ready} 0 1
     if {$cancelFlag} {
         set cancelFlag 0
         return
     }
     z39 callback {present-response}
     z39.$setNo present $setOffset 1
-    show-status {Retrieve} 1 0
+    show-status {Retrieving} 1 0
 }
 
 proc present-more {number} {
@@ -1029,7 +1143,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 {} {
@@ -1068,7 +1182,8 @@ proc add-title-lines {setno no offset} {
         $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
     }
 }
 
@@ -1105,7 +1220,7 @@ proc present-response {} {
         }
         z39.$setNo present $setOffset $toGet
     } else {
-        show-status {Finished} 0 1
+        show-status {Ready} 0 1
     }
 }
 
@@ -1171,6 +1286,20 @@ proc define-target-dialog {} {
     top-down-ok-cancel $w {define-target-action} 1
 }
 
+proc protocol-setup-delete {target} {
+    global profile
+
+    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)
+        cascade-target-list
+    }
+}
+
 proc protocol-setup-action {target} {
     global profile
     global csRadioType
@@ -1260,10 +1389,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
+        }
     }
 }
 
@@ -1334,7 +1470,7 @@ proc protocol-setup {target} {
     }
 
     # 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" \
@@ -1359,7 +1495,7 @@ 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 \
@@ -1371,7 +1507,7 @@ proc protocol-setup {target} {
             -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 \
@@ -1383,7 +1519,7 @@ proc protocol-setup {target} {
             -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
@@ -1396,6 +1532,7 @@ proc protocol-setup {target} {
 
     # Ok-cancel
     bottom-buttons $w [list {Ok} [list protocol-setup-action $target] \
+            {Delete} [list protocol-setup-delete $target] \
             {Cancel} [list destroy $w]] 0   
 }
 
@@ -1448,13 +1585,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
@@ -1514,12 +1650,45 @@ proc query-new {} {
     frame $w.top.index
     pack $w.top.index \
             -side top -anchor e -pady 2 
-    entry-fields $w.top {index} \
+    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
@@ -1537,15 +1706,29 @@ proc cascade-query-list {} {
         $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
     
     set windowGeometry(.) [wm geometry .]
 
     set f [open "clientg.tcl" w]
 
+    puts $f "set hotTargets \{ $hotTargets \}"
+    puts $f "set textWrap $textWrap"
+    puts $f "set displayFormat $displayFormat"
+    puts $f "set popupMarcdf $popupMarcdf"
     foreach n [array names windowGeometry] {
         puts -nonewline $f "set \{windowGeometry($n)\} \{"
         puts -nonewline $f $windowGeometry($n)
@@ -1555,7 +1738,6 @@ proc save-geometry {} {
 }
 
 proc save-settings {} {
-    global hotTargets 
     global profile
     global settingsChanged
     global queryTypes
@@ -1564,7 +1746,6 @@ proc save-settings {} {
     
     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)\} \{"
@@ -1595,9 +1776,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
@@ -1690,13 +1873,14 @@ proc listbuttonv {button var names} {
 }
 
 proc query-add-index-action {queryNo} {
-    set w .setup-query
+    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
@@ -1705,7 +1889,7 @@ proc query-add-index-action {queryNo} {
 }
 
 proc query-add-line {queryNo} {
-    set w .setup-query
+    set w .query-setup
 
     global queryInfoTmp
     global queryButtonsTmp
@@ -1719,7 +1903,7 @@ proc query-add-line {queryNo} {
 }
 
 proc query-del-line {queryNo} {
-    set w .setup-query
+    set w .query-setup
 
     global queryInfoTmp
     global queryButtonsTmp
@@ -1737,14 +1921,14 @@ proc query-add-index {queryNo} {
     set w .query-add-index
 
     toplevel $w
-    place-force $w .setup-query
+    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
 }
 
@@ -1753,6 +1937,9 @@ proc query-setup-action {queryNo} {
     global queryInfo
     global queryButtonsTmp
     global queryInfoTmp
+    global queryButtonsFind
+    global queryInfoFind
+    
     global settingsChanged 
 
     set settingsChanged 1
@@ -1761,7 +1948,11 @@ proc query-setup-action {queryNo} {
             $queryInfoTmp]
     set queryButtons [lreplace $queryButtons $queryNo $queryNo \
             $queryButtonsTmp]
-    destroy .setup-query
+    set queryInfoFind $queryInfoTmp
+    set queryButtonsFind $queryButtonsTmp
+
+    destroy .query-setup
+    index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
 }
 
 proc activate-e-index {value no i} {
@@ -1929,6 +2120,7 @@ proc use-attr {init} {
         set lno [lindex [$w.top.use.list curselection] 0]
         set i [expr $lno+$lno+1]
         set useTmpValue [lindex $attr $i]
+        puts "useTmpValue=$useTmpValue"
     }
 }
 
@@ -1945,6 +2137,9 @@ proc index-setup-action {oldAttr queryNo indexNo} {
 
     use-attr 0
 
+    puts "index-setup-action"
+    puts "queryNo $queryNo"
+    puts "indexNo $indexNo"
     if {$useTmpValue > 0} {
         lappend attr "1=$useTmpValue"
     }
@@ -1963,6 +2158,7 @@ proc index-setup-action {oldAttr queryNo indexNo} {
     if {$completenessTmpValue > 0} {
         lappend attr "6=$completenessTmpValue"
     }
+    puts "new attr $attr"
     set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
     destroy .index-setup
 }
@@ -2006,6 +2202,9 @@ proc index-setup {attr queryNo indexNo} {
             }
         }
     }
+    if {[winfo exists $w]} {
+        destroy $w
+    }
     toplevelG $w
 
     set n [lindex $attr 0]
@@ -2084,15 +2283,33 @@ proc index-setup {attr queryNo indexNo} {
 
 proc query-edit-index {queryNo} {
     global queryInfoTmp
-    global queryIndexTmp
+    set w .query-setup
 
-    set attr [lindex $queryInfoTmp $queryIndexTmp]
-    puts "Editing $attr"
-    index-setup $attr $queryNo $queryIndexTmp
+    set i [lindex [$w.top.index.list 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.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 .setup-query
+    set w .query-setup
 
     global queryTypes
     global queryButtons
@@ -2115,19 +2332,45 @@ proc query-setup {queryNo} {
 
     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
 
-    pack $w.top.lines -side left -pady 6 -padx 6 -fill y
+    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]
 
-    # Ok-cancel
+    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] \
             {Edit index} [list query-edit-index $queryNo] \
-            {Add line} [list query-add-line $queryNo] \
-            {Delete line} [list query-del-line $queryNo] \
+            {Delete index} [list query-delete-index $queryNo] \
             {Cancel} [list destroy $w]] 0
 }
 
@@ -2276,13 +2519,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}
@@ -2299,19 +2542,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}
+.top.service.m add command -label "Scan" -command {scan-request}
+
 .top.service configure -state disabled
 
 menubutton .top.rset -text "Set" -menu .top.rset.m
@@ -2319,31 +2561,43 @@ 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 "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
 
 menu .top.options.m.query
-.top.options.m.query add cascade -label "Choose query" \
+.top.options.m.query add cascade -label "Select" \
         -menu .top.options.m.query.clist
-.top.options.m.query add cascade -label "Edit query" \
+.top.options.m.query add cascade -label "Edit" \
         -menu .top.options.m.query.slist
-.top.options.m.query add command -label "Define query" \
+.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 \
-            -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}
+
 menubutton .top.help -text "Help" -menu .top.help.m
 menu .top.help.m
 
@@ -2368,7 +2622,7 @@ 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
@@ -2401,11 +2655,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