X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=client.tcl;h=f4c37c8dac75a595888cdf2e8ef3ce5c33fc393b;hb=aa30eee6a1b9d8b08982965c7235ba3b806e94b9;hp=a1ee047e2d39277a8b5cd4e662be49ee65b24555;hpb=bc07d4779a313ab6b554776fac5bb00409c70862;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index a1ee047..f4c37c8 100644
--- a/client.tcl
+++ b/client.tcl
@@ -1,6 +1,21 @@
 #
 # $Log: client.tcl,v $
-# Revision 1.25  1995-05-31 13:09:57  adam
+# 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.
 #
@@ -93,6 +108,7 @@ set settingsChanged 0
 set setNo 0
 set cancelFlag 0
 set searchEnable 0
+set fullMarcSeq 0
 
 set queryTypes {Simple}
 set queryButtons { { {I 0} {I 1} {I 2} } }
@@ -118,22 +134,21 @@ proc top-down-window {w} {
 
 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"
     pack $w.bot.cancel -side left -expand yes    
 
     if {$g} {
-        # Grab ...
         grab $w
         tkwait window $w
     }
 }
 
-proc top-down-ok-cancelx {w buttonList g} {
+proc bottom-buttons {w buttonList g} {
     set i 0
     set l [llength $buttonList]
 
@@ -141,19 +156,15 @@ proc top-down-ok-cancelx {w buttonList g} {
     pack $w.bot.$i -side left -expand yes -padx 5 -pady 5
     button $w.bot.$i.ok -text [lindex $buttonList $i] \
             -command [lindex $buttonList [expr $i+1]]
-    pack $w.bot.$i.ok -expand yes -padx 3 -pady 3 -side left
+    pack $w.bot.$i.ok -expand yes -ipadx 2 -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 -padx 3 -pady 3 -side left
+        pack $w.bot.$i -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
         incr i 2
     }
-    button $w.bot.cancel -width 6 -text {Cancel} \
-            -command "destroy $w"
-    pack $w.bot.cancel -side left -expand yes    
-    
     if {$g} {
         # Grab ...
         grab $w
@@ -163,13 +174,16 @@ proc top-down-ok-cancelx {w buttonList g} {
 
 proc cancel-operation {} {
     global cancelFlag
+    global busy
 
     set cancelFlag 1
-    show-status Cancelled 0 {}
+    if {$busy} {
+        show-status Cancelled 0 {}
+    }
 }
 
 proc show-target {target} {
-    .bot.target configure -text "$target"
+    .bot.a.target configure -text "$target"
 }
 
 proc show-logo {v1} {
@@ -179,17 +193,17 @@ proc show-logo {v1} {
         if {$v1==0} {
             set v1 9
         }
-        .mid.logo configure -bitmap @book${v1}
+        .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
         }
-        .mid.logo configure -bitmap @book1
     }
 }
         
@@ -197,7 +211,7 @@ proc show-status {status b sb} {
     global busy
     global searchEnable
 
-    .bot.status configure -text "$status"
+    .bot.a.status configure -text "$status"
     if {$b == 1} {
         if {$busy == 0} {set busy 1}
     } else {
@@ -207,22 +221,31 @@ proc show-status {status b sb} {
         return
     }
     if {$sb} {
-        .top.search configure -state normal
+        .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
+        }
         set searchEnable 1
     } else {
-        .top.search configure -state disabled
+        .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
     }
 }
 
 proc show-message {msg} {
-    .bot.message configure -text "$msg"
+    .bot.a.message configure -text "$msg"
 }
 
 proc insertWithTags {w text args} {
@@ -236,11 +259,60 @@ proc insertWithTags {w text args} {
     }
 }
 
-proc show-full-marc {no} {
-    global setNo
+proc about-target {} {
+    set w .about-target-w
+
+    toplevel $w
+
+    wm title $w "About target"
+    place-force $w .
+    top-down-window $w
+
+    set i [z39 targetImplementationName]
+    label $w.top.in -text "Implementation name: $i"
+    set i [z39 targetImplementationId]
+    label $w.top.ii -text "Implementation id: $i"
+    set i [z39 targetImplementationVersion]
+    label $w.top.iv -text "Implementation version: $i"
+    set i [z39 options]
+    label $w.top.op -text "Protocol options: $i"
+
+    pack $w.top.in $w.top.ii $w.top.iv $w.top.op -side top -anchor nw
+
+    bottom-buttons $w [list {Close} [list destroy $w]] 1
+}
+
+proc about-origin {} {
+    set w .about-origin-w
+
+    toplevel $w
+
+    wm title $w "About IrTcl"
+    place-force $w .
+    top-down-window $w
+
+    set i [z39 implementationName]
+    label $w.top.in -text "Implementation name: $i"
+    set i [z39 implementationId]
+    label $w.top.ii -text "Implementation id: $i"
+
+    pack $w.top.in $w.top.ii -side top -anchor nw
+
+    bottom-buttons $w [list {Close} [list destroy $w]] 1
+}
 
-    set w .full-marc
+proc show-full-marc {sno no b} {
+    global fullMarcSeq
 
+    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
@@ -248,7 +320,7 @@ proc show-full-marc {no} {
 
         toplevel $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
@@ -262,9 +334,7 @@ proc show-full-marc {no} {
 
         set new 1
     }
-    incr no
-    
-    set r [z39.$setNo getMarc $no list * * *]
+    set r [z39.$sno getMarc $no list * * *]
 
     $w.top.record tag configure marc-tag -foreground blue
     $w.top.record tag configure marc-data -foreground black
@@ -296,15 +366,10 @@ proc show-full-marc {no} {
         
         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
+
+        bottom-buttons $w [list \
+                {Close} [list destroy $w] \
+                {Duplicate} [list show-full-marc $sno $no 1]] 0
     }
 }
 
@@ -313,7 +378,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} {
@@ -386,6 +451,7 @@ proc open-target {target base} {
     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 {
@@ -394,10 +460,12 @@ proc open-target {target base} {
     z39 failback [list fail-response $target]
     z39 callback [list connect-response $target]
     z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
-    show-status {Connecting} 1 0
+#    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 {} {
@@ -407,12 +475,12 @@ proc close-target {} {
     set cancelFlag 0
     set hostid Default
     z39 disconnect
-    show-target {None}
+    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
-    .mid.logo configure -bitmap @book1
 }
 
 proc load-set-action {} {
@@ -432,6 +500,9 @@ proc load-set-action {} {
         set no [z39.$setNo numberOfRecordsReturned]
         add-title-lines $setNo $no 1
     }
+    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 {}
 }
 
@@ -478,7 +549,6 @@ proc init-response {} {
         return
     }
     show-status {Ready} 0 1
-    .mid.logo configure -bitmap @book1
     if {![z39 initResult]} {
         set u [z39 userInformationField]
         close-target
@@ -524,54 +594,210 @@ proc search-request {} {
     show-status {Search} 1 0
 }
 
-proc scan-request {} {
+proc scan-request {attr} {
     set w .scan-window
 
     global profile
     global hostid
+    global scanView
+    global scanTerm
 
     set target $hostid
+    set scanView 0
+    set scanTerm {}
 
     ir-scan z39.scan z39
 
-    z39 callback {scan-response}
     if {![winfo exists $w]} {
         toplevel $w
         
         wm title $w "Scan"
         
-        wm minsize $w 200 200
+        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 -geometry 50x14
+            scrollbar $w.top.scroll -orient vertical -border 1
+            pack $w.top.list -side left -fill both -expand yes
+            pack $w.top.scroll -side right -fill y
+            $w.top.scroll config -command [list $w.top.list yview]
+        } else {
+            listbox $w.top.list -font fixed -geometry 60x14
+            pack $w.top.list -side left -fill both -expand yes
+        }
         
-        listbox $w.top.list -yscrollcommand [list $w.top.scroll set] \
-                -font fixed -geometry 50x14
-        scrollbar $w.top.scroll -orient vertical -border 1
-        pack $w.top.list -side left -fill both -expand yes
-        pack $w.top.scroll -side right -fill y
-        $w.top.scroll config -command [list $w.top.list yview]
+        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]
+    }
+    focus $w.top.entry
+    z39 callback [list scan-response $attr 0 25]
+    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
 
-        top-down-ok-cancelx $w [list {Close} [list destroy $w]] 0 
+    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 25]
+    z39.scan numberOfTermsRequested 5
+    z39.scan preferredPositionInResponse 1
+    $w.top.list delete 0 end
+    puts "${attr} \{${scanTerm}\}"
+    if {$scanTerm == ""} {
+        z39.scan scan "${attr} 0"
+    } else {
+        z39.scan scan "${attr} \{${scanTerm}\}"
     }
-    z39.scan numberOfTermsRequested 100
-    z39.scan scan "@attr 1=4 0"
-    
     show-status {Scan} 1 0
 }
 
-proc scan-response {} {
+proc scan-response {attr start toget} {
+    global cancelFlag
+    global scanTerm
+
     set w .scan-window
+    puts "In scan-response"
     set m [z39.scan numberOfEntriesReturned]
     puts $m
-    for {set i 0} {$i < $m} {incr i} {
-        set term [lindex [z39.scan scanLine $i] 1]
-        set nostr [format "%7d" [lindex [z39.scan scanLine $i] 2]]
+    puts attr=$attr
+    puts start=$start
+    puts toget=$toget
 
-        $w.top.list insert end "$nostr $term"
+    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 25]
+        z39.scan numberOfTermsRequested 5
+        z39.scan preferredPositionInResponse 1
+        set scanTerm $nScanTerm
+        $w.top.list delete 0 end
+        puts "${attr} \{${scanTerm}\}"
+        if {$scanTerm == ""} {
+            z39.scan scan "${attr} 0"
+        } else {
+            z39.scan scan "${attr} \{${scanTerm}\}"
+        }
+        show-status {Scan} 1 0
+    }
+    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"
+        }
+    } 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] 30]
+        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
+    if {$scanView < 5} {
+        z39 callback [list scan-response $attr 0 -30]
+        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
+    }
+    set scanView [expr $scanView - 5]
+    $w.top.list yview $scanView
+}
+
 proc search-response {} {
     global setNo
     global setOffset
@@ -582,14 +808,12 @@ proc search-response {} {
     puts "In search-response"
     init-title-lines
     show-status {Ready} 0 1
-    if {$cancelFlag} {
-        set cancelFlag 0
-        return
-    }
-    show-message "[z39.$setNo resultCount] hits"
     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]
@@ -599,12 +823,16 @@ 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 $setOffset $setMax
+    if {$cancelFlag} {
+        set cancelFlag 0
+        return
+    }
+    z39 callback {present-response}
+    z39.$setNo present $setOffset 1
     show-status {Retrieve} 1 0
 }
 
@@ -613,23 +841,36 @@ proc present-more {number} {
     global setOffset
     global setMax
 
+    puts "setOffset=$setOffset"
     puts "present-more"
     if {$setNo == 0} {
+        puts "setNo=$setNo"
 	return
     }
     set max [z39.$setNo resultCount]
-    if {$max <= $setMax} {
+    if {$max <= $setOffset} {
+        puts "max=$max"
+        puts "setOffset=$setOffset"
         return
     }
-    puts "max=$max"
-    puts "setOffset=$setOffset"
     if {$number == ""} {
         set setMax $max
     } else {
         incr setMax $number
+        if {$setMax > $max} {
+            set setMax $max
+        }
     }
     z39 callback {present-response}
-    z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
+
+    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
 }
 
@@ -637,13 +878,33 @@ proc init-title-lines {} {
     .data.list delete 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} {
+    if {$offset == 1} {
+        .data.list delete 0 end
+    }
+    bind .data.list <Double-Button-1> [list title-press %y $setno]
     for {set i 0} {$i < $no} {incr i} {
         set o [expr $i + $offset]
-        set title [lindex [z39.$setno getMarc $o field 245 * a] 0]
-        set year  [lindex [z39.$setno getMarc $o field 260 * c] 0]
-        set nostr [format "%5d" $o]
-        .data.list insert end "$nostr $title - $year"
+        set type [z39.$setno type $o]
+        if {$type == "DB"} {
+            set title [lindex [z39.$setno getMarc $o field 245 * a] 0]
+            set year  [lindex [z39.$setno getMarc $o field 260 * c] 0]
+            set nostr [format "%5d" $o]
+            .data.list insert end "$nostr $title - $year"
+        } elseif {$type == "SD"} {
+            set err [lindex [z39.$setno diag $o] 1]
+            set add [lindex [z39.$setno diag $o] 2]
+            if {$add != {}} {
+                set add " :${add}"
+            }
+            .data.list insert end "Error ${err}${add}"
+        } elseif {$type == ""} {
+            break
+        }
     }
 }
 
@@ -673,7 +934,12 @@ proc present-response {} {
         return
     }
     if {$no > 0 && $setOffset <= $setMax} {
-        z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
+        puts "present 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
     }
@@ -1042,17 +1308,17 @@ proc cascade-query-list {} {
     global queryTypes
 
     set i 0
-    .top.query.m.slist delete 0 last
+    .top.options.m.slist delete 0 last
     foreach n $queryTypes {
-        .top.query.m.slist add command -label $n \
+        .top.options.m.slist add command -label $n \
                 -command [list query-setup $i]
         incr i
     }
 
     set i 0
-    .top.query.m.clist delete 0 last
+    .top.options.m.clist delete 0 last
     foreach n $queryTypes {
-        .top.query.m.clist add command -label $n \
+        .top.options.m.clist add command -label $n \
                 -command [list query-select $i]
         incr i
     }
@@ -1375,11 +1641,12 @@ proc query-setup {queryNo} {
     pack $w.top.completeness.label $w.top.completeness.b -fill x
 
     # Ok-cancel
-    top-down-ok-cancelx $w [list \
+    bottom-buttons $w [list \
             {Ok} [list query-setup-action $queryNo] \
             {Add index} [list query-add-index $queryNo] \
             {Add line} [list query-add-line $queryNo] \
-            {Delete line} [list query-del-line $queryNo]] 0
+            {Delete line} [list query-del-line $queryNo] \
+            {Cancel} [list destroy $w]] 0
 }
 
 proc index-clear {} {
@@ -1515,46 +1782,55 @@ 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}
+.top.file.m add separator
+.top.file.m add command -label "About" -command {about-origin}
 
 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.search -text "Search" -underline 0 -menu .top.search.m
-menu .top.search.m
-.top.search.m add command -label "Database" -command {database-select}
-.top.search.m add cascade -label "Query type" -menu .top.search.m.querytype
-menu .top.search.m.querytype
-.top.search.m.querytype add radiobutton -label "RPN"
-.top.search.m.querytype add radiobutton -label "CCL"
-.top.search.m add cascade -label "Present" -menu .top.search.m.present
-menu .top.search.m.present
-.top.search.m.present add command -label "More" -command [list present-more 10]
-.top.search.m.present add command -label "All" -command [list present-more {}]
-.top.search configure -state disabled
-
-menubutton .top.query -text "Query" -underline 0 -menu .top.query.m
-menu .top.query.m
-.top.query.m add cascade -label "Choose" -menu .top.query.m.clist
-.top.query.m add command -label "Define" -command {new-query-dialog}
-.top.query.m add cascade -label "Edit" -menu .top.query.m.slist
-menu .top.query.m.clist
-menu .top.query.m.slist
+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 "Choose query" -menu .top.options.m.clist
+.top.options.m add command -label "Define query" -command {new-query-dialog}
+.top.options.m add cascade -label "Edit query" -menu .top.options.m.slist
+menu .top.options.m.clist
+menu .top.options.m.slist
 cascade-query-list
 
 menubutton .top.help -text "Help" -menu .top.help.m
@@ -1565,15 +1841,15 @@ menu .top.help.m
 .top.help.m add command -label "About" \
         -command {tkerror "About not available. Sorry"}
 
-pack .top.file .top.target .top.query .top.search -side left
+pack .top.file .top.target .top.service .top.rset .top.options -side left
 pack .top.help -side right
 
 index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
 
 button .mid.search -width 7 -text {Search} -command search-request \
         -state disabled
-button .mid.scan -width 7 -text {Scan} -command scan-request \
-        -state disabled
+button .mid.scan -width 7 -text {Scan} \
+        -command [list scan-request "@attr 1=4"] -state disabled 
 button .mid.present -width 7 -text {Present} -command [list present-more 10] \
         -state disabled
 
@@ -1581,27 +1857,29 @@ 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
 
-button .mid.logo  -bitmap @book1 -command cancel-operation
-pack .mid.logo -side right -pady 3
-
-listbox .data.list -yscrollcommand {.data.scroll set} -font fixed
+listbox .data.list -yscrollcommand {.data.scroll set} -font fixed -geometry 20x2
 scrollbar .data.scroll -orient vertical -border 1
 pack .data.list -side left -fill both -expand yes
 pack .data.scroll -side right -fill y
 .data.scroll config -command {.data.list yview}
 
-message .bot.target -text "None" -aspect 1000 -relief sunken -border 1
-label .bot.status -text "Not connected" -width 12 -relief \
+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.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 -textvariable setNo -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 \
-        -side left -padx 2 -pady 2
 
-bind .data.list <Double-Button-1> {set indx [.data.list nearest %y]
-show-full-marc $indx}
+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
 
 ir z39