X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=client.tcl;h=81901c9ee15cef39f695993a8a18070d46289382;hb=694f7bbadeaa3580f00275fb98becfe9e580f3b2;hp=8237bd8034d5a06273a34a253b6ac7b4e243571d;hpb=9ba8ba049fc899f5b4a07880b4cb00e7fba143fe;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index 8237bd8..81901c9 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,52 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.39  1995-06-14 12:16:22  adam
+# Revision 1.51  1995-06-21 11:11:00  adam
+# Bug fix: libdir undefined in about-origin.
+#
+# Revision 1.50  1995/06/21  11:04:48  adam
+# Uses GNU autoconf 2.3.
+# Install procedure implemented.
+# boook bitmaps moved to sub directory bitmaps.
+#
+# Revision 1.49  1995/06/20  14:16:42  adam
+# More work on cancel mechanism.
+#
+# Revision 1.48  1995/06/20  08:07:23  adam
+# New setting: failInfo.
+# Working on better cancel mechanism.
+#
+# Revision 1.47  1995/06/19  14:05:29  adam
+# Bug fix: asked for SUTRS.
+#
+# Revision 1.46  1995/06/19  13:06:06  adam
+# New define: IR_TCL_VERSION.
+#
+# Revision 1.45  1995/06/19  08:08:44  adam
+# client.tcl: hotTargets now contain both database and target name.
+# ir-tcl.c: setting protocol edited. Errors in callbacks are logged
+# by logf(LOG_WARN, ...) calls.
+#
+# Revision 1.44  1995/06/16  14:55:18  adam
+# Book logo mirrored.
+#
+# Revision 1.43  1995/06/16  14:41:05  adam
+# Scan line entries can be copied to a search entry.
+#
+# Revision 1.42  1995/06/16  12:28:13  adam
+# Implemented preferredRecordSyntax.
+# Minor changes in diagnostic handling.
+# Record list deleted when connection closes.
+#
+# Revision 1.41  1995/06/14  15:07:59  adam
+# Bug fix in cascade-target-list. Uses yaz-version.h.
+#
+# Revision 1.40  1995/06/14  13:37:17  adam
+# Setting recordType implemented.
+# Setting implementationVersion implemented.
+# Settings implementationId / implementationName edited.
+#
+# Revision 1.39  1995/06/14  12:16:22  adam
 # hotTargets, textWrap and displayFormat saved in clientg.tcl.
 #
 # Revision 1.38  1995/06/14  07:22:45  adam
@@ -134,22 +179,27 @@
 # First presentRequest attempts. Hot-target list.
 #
 #
+
+set libdir LIBDIR
+if {[file readable clientrc.tcl]} {
+	set libdir .
+}
 set hotTargets {}
 set hotInfo {}
 set busy 0
 
-set libDir ""
-
-set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} z39v2}
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} Z39}
 set hostid Default
 set settingsChanged 0
 set setNo 0
 set lastSetNo 0
 set cancelFlag 0
-set searchEnable 0
+set scanEnable 0
 set fullMarcSeq 0
 set displayFormat 1
+set popupMarcdf 0
 set textWrap word
+set delayRequest {}
 
 set queryTypes {Simple}
 set queryButtons { { {I 0} {I 1} {I 2} } }
@@ -157,13 +207,19 @@ set queryInfo { { {Title {1=4 4=1}} {Author {1=1}} \
         {Subject {1=21}} {Any {1=1016}} } }
 wm minsize . 0 0
 
+set setOffset 0
+set setMax 0
+
 proc read-formats {} {
     global displayFormats
-    set formats [glob -nocomplain formats/*.tcl]
+    global libdir
+    set formats [glob -nocomplain ${libdir}/formats/*.tcl]
     foreach f $formats {
-        source $f
-        set l [expr [string length $f] - 5]
- 	lappend displayFormats [string range $f 8 $l]
+	if {[file readable $f]} {
+             source $f
+             set l [expr [string length $f] - 5]
+ 	     lappend displayFormats [string range $f 8 $l]
+        }
     }
 }
 
@@ -174,18 +230,27 @@ proc set-wrap {m} {
     .data.record configure -wrap $m
 }
 
+proc dputs {m} {
+    puts $m
+}
+
 proc set-display-format {f} {
     global displayFormat
     global setNo
+    global busy
 
     set displayFormat $f
     if {$setNo == 0} {
         return
     }
-    .bot.a.status configure -text "Reformatting"
+    if {!$busy} {
+        .bot.a.status configure -text "Reformatting"
+    }
     update idletasks
     add-title-lines 0 10000 1
-    .bot.a.status configure -text "Done"
+    if {!$busy} {
+        .bot.a.status configure -text "Ready"
+    }
 }
 
 proc initBindings {} {
@@ -209,6 +274,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} {
@@ -228,12 +303,12 @@ proc toplevelG {w} {
     bind $w <Destroy> [list destroyGW $w]
 }
 
-if {[file readable "clientrc.tcl"]} {
-    source "clientrc.tcl"
+if {[file readable "${libdir}/clientrc.tcl"]} {
+    source "${libdir}/clientrc.tcl"
 }
 
-if {[file readable "clientg.tcl"]} {
-    source "clientg.tcl"
+if {[file readable "~/.clientrc.tcl"]} {
+    source "~/.clientrc.tcl"
 }
 
 set queryButtonsFind [lindex $queryButtons 0]
@@ -290,30 +365,44 @@ proc bottom-buttons {w buttonList g} {
 proc cancel-operation {} {
     global cancelFlag
     global busy
+    global delayRequest
 
-    set cancelFlag 1
     if {$busy} {
-        show-status Cancelled 0 {}
+        set cancelFlag 1
+        set delayRequest {}
+        show-status Cancel 0 1
     }
 }
 
-proc show-target {target} {
-    .bot.a.target configure -text "$target"
+proc show-target {target base} {
+    global profile
+
+    if {$target == ""} {
+        .bot.a.target configure -text ""
+        return
+    }
+    if {$base == ""} {
+         .bot.a.target configure -text "$target"
+    } else {
+         .bot.a.target configure -text "$target - $base"
+    }
 }
 
 proc show-logo {v1} {
     global busy
+    global libdir
+
     if {$busy != 0} {
-        incr v1 -1
-        if {$v1==0} {
-            set v1 9
+        incr v1
+        if {$v1==10} {
+            set v1 1
         }
-        .bot.logo configure -bitmap @book${v1}
+        .bot.logo configure -bitmap @${libdir}/bitmaps/book${v1}
         after 140 [list show-logo $v1]
         return
     }
     while {1} {
-        .bot.logo configure -bitmap @book1
+        .bot.logo configure -bitmap @${libdir}/bitmaps/book1
         tkwait variable busy
         if {$busy} {
             show-logo 1
@@ -324,7 +413,10 @@ proc show-logo {v1} {
         
 proc show-status {status b sb} {
     global busy
-    global searchEnable
+    global scanEnable
+    global setOffset
+    global setMax
+    global setNo
 
     .bot.a.status configure -text "$status"
     if {$b == 1} {
@@ -338,13 +430,21 @@ proc show-status {status b sb} {
     if {$sb} {
         .top.service configure -state normal
         .mid.search configure -state normal
-        .mid.scan configure -state normal
-        .mid.present configure -state normal
+        if {$scanEnable} {
+            .mid.scan configure -state normal
+        }
+        if {$setNo == 0} {
+            .top.service.m disable 1
+        } elseif {$setOffset > 0 && $setOffset <= [z39.$setNo resultCount]} {
+            .top.service.m enable 1
+            .mid.present configure -state normal
+        } else {
+            .top.service.m disable 1
+        }
         if {[winfo exists .scan-window]} {
             .scan-window.bot.2 configure -state normal
             .scan-window.bot.4 configure -state normal
         }
-        set searchEnable 1
     } else {
         .top.service configure -state disabled
         .mid.search configure -state disabled
@@ -355,7 +455,6 @@ proc show-status {status b sb} {
             .scan-window.bot.2 configure -state disabled
             .scan-window.bot.4 configure -state disabled
         }
-        set searchEnable 0
     }
 }
 
@@ -375,6 +474,7 @@ proc insertWithTags {w text args} {
 }
 
 proc popup-license {} {
+    global libdir
     set w .popup-licence
     toplevel $w
 
@@ -391,12 +491,14 @@ proc popup-license {} {
     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
+    if {[file readable "${libdir}/LICENSE"]} {
+        set f [open "${libdir}/LICENSE" r]
+        while {[gets $f buf] != -1} {
+            $w.top.t insert end $buf
+            $w.top.t insert end "\n"
+        } 
+        close $f
+    }
     bottom-buttons $w [list {Close} [list destroy $w]] 1
 }
 
@@ -434,20 +536,22 @@ proc about-target {} {
 }
 
 proc about-origin-logo {n} {
+    global libdir
     set w .about-origin-w
     if {![winfo exists $w]} {
         return
     }
-    incr n -1
-    if {$n==0} {
-        set n 9
+    incr n
+    if {$n==10} {
+        set n 1
     }
-    $w.top.a.logo configure -bitmap @book$n
+    $w.top.a.logo configure -bitmap @${libdir}/bitmaps/book$n
     after 140 [list about-origin-logo $n]
 }
 
 proc about-origin {} {
     set w .about-origin-w
+    global libdir
     
     if {[winfo exists $w]} {
         destroy $w
@@ -465,15 +569,17 @@ proc about-origin {} {
     
     label $w.top.a.irtcl -text "IrTcl" \
             -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
-    label $w.top.a.logo -bitmap @book1 
+    label $w.top.a.logo -bitmap @${libdir}/bitmaps/book1 
     pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
 
     set i [z39 implementationName]
     label $w.top.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
 
     about-origin-logo 1
     bottom-buttons $w [list {Close} [list destroy $w] \
@@ -494,11 +600,7 @@ proc popup-marc {sno no b df} {
         set df $popupMarcdf
     } else {
         set w .full-marc
-        if {[info exists popupMarcdf]} {
-            set df $popupMarcdf
-        } else {
-            set popupMarcdf $df
-        }
+        set df $popupMarcdf
     }
     if {[winfo exists $w]} {
         set new 0
@@ -529,7 +631,8 @@ 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"
@@ -571,18 +674,22 @@ proc popup-marc {sno no b df} {
     }
 }
 
-proc update-target-hotlist {target} {
+proc update-target-hotlist {target base} {
     global hotTargets
 
     set len [llength $hotTargets]
     if {$len > 0} {
         .top.target.m delete 6 [expr 6+[llength $hotTargets]]
     }
-    set indx [lsearch $hotTargets $target]
-    if {$indx >= 0} {
-        set hotTargets [lreplace $hotTargets $indx $indx]
+    set i 0
+    foreach e $hotTargets {
+        if {$target == [lindex $e 0] && $base == [lindex $e 1]} {
+            set hotTargets [lreplace $hotTargets $i $i]
+            break
+        }
+        incr i    
     }
-    set hotTargets [linsert $hotTargets 0 $target]
+    set hotTargets [linsert $hotTargets 0 [list $target $base]]
     set-target-hotlist    
 } 
 
@@ -590,9 +697,16 @@ proc set-target-hotlist {} {
     global hotTargets
     
     set i 1
-    foreach target $hotTargets {
-        .top.target.m add command -label "$i $target" -command \
+    foreach e $hotTargets {
+        set target [lindex $e 0]
+        set base [lindex $e 1]
+        if {$base == ""} {
+            .top.target.m add command -label "$i $target" -command \
                 [list reopen-target $target {}]
+        } else {
+            .top.target.m add command -label "$i $target - $base" -command \
+                [list reopen-target $target $base]
+        }
         incr i
         if {$i > 8} {
              break
@@ -603,7 +717,7 @@ proc set-target-hotlist {} {
 proc reopen-target {target base} {
     close-target
     open-target $target $base
-    update-target-hotlist $target
+    update-target-hotlist $target $base
 }
 
 proc define-target-action {} {
@@ -613,7 +727,6 @@ proc define-target-action {} {
     if {$target == ""} {
         return
     }
-    update-target-hotlist $target
     foreach n [array names profile] {
         if {$n == $target} {
             protocol-setup $n
@@ -621,7 +734,7 @@ proc define-target-action {} {
         }
     }
     set seq [lindex $profile(Default) 12]
-    puts "seq=${seq}"
+    dputs "seq=${seq}"
     set profile($target) $profile(Default)
     set profile(Default) [lreplace $profile(Default) 12 12 [incr seq]]
 
@@ -630,13 +743,15 @@ proc define-target-action {} {
 }
 
 proc fail-response {target} {
+    set c [lindex [z39 failInfo] 0]
+    set m [lindex [z39 failInfo] 1]
     close-target
-    tkerror "Target connection closed or protocol error"
+    tkerror "$m ($c)"
 }
 
-proc connect-response {target} {
-    puts "connect-response"
-    show-target $target
+proc connect-response {target base} {
+    dputs "connect-response"
+    show-target $target $base
     init-request
 }
 
@@ -646,24 +761,32 @@ proc open-target {target base} {
 
     z39 disconnect
     z39 comstack [lindex $profile($target) 6]
+    z39 protocol [lindex $profile($target) 11]
     z39 idAuthentication [lindex $profile($target) 3]
     z39 maximumRecordSize [lindex $profile($target) 4]
     z39 preferredMessageSize [lindex $profile($target) 5]
-    puts -nonewline "maximumRecordSize="
-    puts [z39 maximumRecordSize]
-    puts -nonewline "preferredMessageSize="
-    puts [z39 preferredMessageSize]
-    show-status {Connecting} 0 0
+    dputs "maximumRecordSize="
+    dputs [z39 maximumRecordSize]
+    dputs "preferredMessageSize="
+    dputs [z39 preferredMessageSize]
+    show-status {Connecting} 1 0
     if {$base == ""} {
         z39 databaseNames [lindex [lindex $profile($target) 7] 0]
     } else {
         z39 databaseNames $base
     }
     z39 failback [list fail-response $target]
-    z39 callback [list connect-response $target]
-    z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
+    z39 callback [list connect-response $target $base]
+    update idletasks
+    set err [catch {
+        z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
+        } errorMessage]
+    if {$err} {
+        tkerror $errorMessage
+        show-status Ready 0 {}
+        return
+    }
 #    z39 options search present scan namedResultSets triggerResourceCtrl
-    show-status {Connecting} 1 {}
     set hostid $target
     .top.target.m disable 0
     .top.target.m enable 1
@@ -673,12 +796,16 @@ proc open-target {target base} {
 proc close-target {} {
     global hostid
     global cancelFlag
+    global setNo
 
     set cancelFlag 0
+    set setNo 0
+    .bot.a.set configure -text ""
     set hostid Default
     z39 disconnect
-    show-target {}
+    show-target {} {}
     show-status {Not connected} 0 0
+    init-title-lines
     show-message {}
     .top.target.m disable 1
     .top.target.m disable 2
@@ -737,37 +864,60 @@ proc init-request {} {
     }
     z39 callback {init-response}
     show-status {Initializing} 1 {}
-    z39 init
+    set err [catch {z39 init} errorMessage]
+    if {$err} {
+        tkerror $errorMessage
+        show-status Ready 0 {}
+    }
 }
 
 proc init-response {} {
     global cancelFlag
+    global scanEnable
 
     if {$cancelFlag} {
         close-target
         return
     }
-    show-status {Ready} 0 1
     if {![z39 initResult]} {
+        show-status {Ready} 0 1
         set u [z39 userInformationField]
         close-target
         tkerror "Connection rejected by target: $u"
+    } else {
+        if {[lsearch [z39 options] scan] >= 0} {
+            set scanEnable 1
+        } else {
+            set scanEnable 0
+        }
+        show-status {Ready} 0 1
     }
 }
 
-proc search-request {} {
+proc search-request {bflag} {
     global setNo
     global profile
     global hostid
     global busy
     global cancelFlag
-    global searchEnable
+    global delayRequest
 
     set target $hostid
 
-    if {$searchEnable == 0} {
+    dputs "search-request"
+    show-message {}
+    if {!$bflag && $busy} {
+        dputs "busy: search-request ignored"
         return
     }
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Searching} 1 0
+        set delayRequest {search-request 1}
+        return
+    }
+    set delayRequest {} 
+
     set query [index-query]
     if {$query==""} {
         return
@@ -777,10 +927,10 @@ proc search-request {} {
 
     if {[lindex $profile($target) 10] == 1} {
         z39.$setNo setName $setNo
-        puts "setName=${setNo}"
+        dputs "setName=${setNo}"
     } else {
         z39.$setNo setName Default
-        puts "setName=Default"
+        dputs "setName=Default"
     }
     if {[lindex $profile($target) 8] == 1} {
         z39.$setNo queryType rpn
@@ -790,13 +940,15 @@ proc search-request {} {
     }
     z39 callback {search-response}
     z39.$setNo search $query
-    show-status {Search} 1 0
+    show-status {Searching} 1 0
 }
 
-proc scan-focus {w} {
-    set oldFocus [focus]
-    bind $w <Leave> [list focus $oldFocus]
-    focus $w.top.entry
+proc scan-copy {y entry} {
+    set w .scan-window
+    set no [$w.top.list nearest $y]
+    dputs "no=$no"
+    .lines.$entry.e delete 0 end
+    .lines.$entry.e insert 0 [string range [$w.top.list get $no] 8 end]
 }
 
 proc scan-request {} {
@@ -809,6 +961,17 @@ proc scan-request {} {
     global curIndexEntry
     global queryButtonsFind
     global queryInfoFind
+    global cancelFlag
+    global delayRequest
+
+    dputs "scan-request"
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Scanning} 1 0
+        set delayRequest scan-request
+        return
+    }
+    set delayRequest {} 
 
     set target $hostid
     set scanView 0
@@ -850,15 +1013,15 @@ proc scan-request {} {
         bind $w.top.list <Up> [list scan-up $attr]
         bind $w.top.list <Down> [list scan-down $attr]
     }
+    bind $w.top.list <Double-Button-1> [list scan-copy %y $curIndexEntry]
     wm title $w "Scan $title"
-#    bind $w.top <Any-Enter> [list scan-focus $w]
         
     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} {
@@ -877,31 +1040,39 @@ proc scan-term-h {attr} {
     z39 callback [list scan-response $attr 0 35]
     z39.scan numberOfTermsRequested 5
     z39.scan preferredPositionInResponse 1
-    puts "${attr} \{${scanTerm}\}"
+    dputs "${attr} \{${scanTerm}\}"
     if {$scanTerm == ""} {
         z39.scan scan "${attr} 0"
     } else {
         z39.scan scan "${attr} \{${scanTerm}\}"
     }
-    show-status {Scan} 1 0
+    show-status {Scanning} 1 0
 }
 
 proc scan-response {attr start toget} {
     global cancelFlag
+    global delayRequest
     global scanTerm
     global scanView
 
     set w .scan-window
-    puts "In scan-response"
+    dputs "In scan-response"
     set m [z39.scan numberOfEntriesReturned]
-    puts $m
-    puts attr=$attr
-    puts start=$start
-    puts toget=$toget
+    dputs $m
+    dputs attr=$attr
+    dputs start=$start
+    dputs toget=$toget
 
     if {![winfo exists .scan-window]} {
+        if {$cancelFlag} {
+            set cancelFlag 0
+            dputs "Handling cancel"
+            if {$delayRequest != ""} {
+                eval $delayRequest
+            }
+            return
+        }
         show-status {Ready} 0 1
-        set cancelFlag 0
         return
     }
     set nScanTerm [$w.top.entry get]
@@ -910,13 +1081,13 @@ proc scan-response {attr start toget} {
         z39.scan numberOfTermsRequested 5
         z39.scan preferredPositionInResponse 1
         set scanTerm $nScanTerm
-        puts "${attr} \{${scanTerm}\}"
+        dputs "${attr} \{${scanTerm}\}"
         if {$scanTerm == ""} {
             z39.scan scan "${attr} 0"
         } else {
             z39.scan scan "${attr} \{${scanTerm}\}"
         }
-        show-status {Scan} 1 0
+        show-status {Scanning} 1 0
         return
     }
     set status [z39.scan scanStatus]
@@ -943,32 +1114,36 @@ proc scan-response {attr start toget} {
         }
     }
     if {$cancelFlag} {
-        show-status {Ready} 0 1
+        dputs "Handling cancel"
         set cancelFlag 0
+        if {$delayRequest != ""} {
+            eval $delayRequest
+        }
         return
     }
+    set delayRequest {}
     if {$toget > 0 && $m > 1 && $m < $toget} {
         set ntoget [expr $toget - $m + 1]
-        puts ntoget=$ntoget
+        dputs ntoget=$ntoget
         z39 callback [list scan-response $attr [expr $start + $m - 1] $ntoget]
         set q $term
-        puts "down continue: $q"
+        dputs "down continue: $q"
         if {$ntoget > 10} {
             z39.scan numberOfTermsRequested 10
         } else {
             z39.scan numberOfTermsRequested $ntoget
         }
         z39.scan preferredPositionInResponse 1
-        puts "${attr} \{$q\}"
+        dputs "${attr} \{$q\}"
         z39.scan scan "${attr} \{$q\}"
         return
     }
     if {$toget < 0 && $m > 1 && $m < [expr - $toget]} {
         set ntoget [expr - $toget - $m]
-        puts ntoget=$ntoget
+        dputs ntoget=$ntoget
         z39 callback [list scan-response $attr 0 -$ntoget]
         set q [string range [$w.top.list get 0] 8 end]
-        puts "up continue: $q"
+        dputs "up continue: $q"
         if {$ntoget > 10} {
             z39.scan numberOfTermsRequested 10
             z39.scan preferredPositionInResponse 11
@@ -976,7 +1151,7 @@ proc scan-response {attr start toget} {
             z39.scan numberOfTermsRequested $ntoget
             z39.scan preferredPositionInResponse [incr ntoget]
         }
-        puts "${attr} \{$q\}"
+        dputs "${attr} \{$q\}"
         z39.scan scan "${attr} \{$q\}"
         return
     }
@@ -985,6 +1160,17 @@ proc scan-response {attr start toget} {
 
 proc scan-down {attr} {
     global scanView
+    global cancelFlag
+    global delayRequest
+
+    dputs {scan-down}
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Scanning down} 1 0
+        set delayRequest [list scan-down $attr]
+        return
+    }
+    set delayRequest {} 
 
     set w .scan-window
     set scanView [expr $scanView + 5]
@@ -992,11 +1178,11 @@ proc scan-down {attr} {
     if {$scanView > $s} {
         z39 callback [list scan-response $attr [expr $s - 1] 25]
         set q [string range [$w.top.list get [expr $s - 1]] 8 end]
-        puts "down: $q"
+        dputs "down: $q"
         z39.scan numberOfTermsRequested 10
         z39.scan preferredPositionInResponse 1
-        show-status {Scan} 1 0
-        puts "${attr} \{$q\}"
+        show-status {Scanning} 1 0
+        dputs "${attr} \{$q\}"
         z39.scan scan "${attr} \{$q\}"
         return
     }
@@ -1005,16 +1191,27 @@ proc scan-down {attr} {
 
 proc scan-up {attr} {
     global scanView
+    global cancelFlag
+    global delayRequest
+
+    dputs {scan-up}
+    if {$cancelFlag} {
+        dputs "cancelFlag"
+        show-status {Scanning up} 1 0
+        set delayRequest [list scan-up $attr]
+        return
+    }
+    set delayRequest {} 
 
     set w .scan-window
     set scanView [expr $scanView - 5]
     if {$scanView < 0} {
         z39 callback [list scan-response $attr 0 -25]
         set q [string range [$w.top.list get 0] 8 end]
-        puts "up: $q"
+        dputs "up: $q"
         z39.scan numberOfTermsRequested 10
         z39.scan preferredPositionInResponse 11
-        show-status {Scan} 1 0
+        show-status {Scanning} 1 0
         z39.scan scan "${attr} \{$q\}"
         return
     }
@@ -1027,16 +1224,26 @@ proc search-response {} {
     global setMax
     global cancelFlag
     global busy
+    global delayRequest
 
-    puts "In search-response"
+    dputs "In search-response"
+    if {$cancelFlag} {
+        dputs "Handling cancel"
+        set cancelFlag 0
+        if {$delayRequest != ""} {
+            eval $delayRequest
+        }
+        return
+    }
+    set delayRequest {}
     init-title-lines
-    show-status {Ready} 0 1
     set setMax [z39.$setNo resultCount]
     show-message "${setMax} hits"
     set l [format "%-4d %7d" $setNo $setMax]
     .top.rset.m add command -label $l \
             -command [list add-title-lines $setNo 10000 1]
     if {$setMax <= 0} {
+        show-status {Ready} 0 1
         set status [z39.$setNo responseStatus]
         if {[lindex $status 0] == "NSD"} {
             set code [lindex $status 1]
@@ -1050,30 +1257,36 @@ proc search-response {} {
         set setMax 20
     }
     set setOffset 1
-    if {$cancelFlag} {
-        set cancelFlag 0
-        return
-    }
+    show-status {Ready} 0 1
     z39 callback {present-response}
     z39.$setNo present $setOffset 1
-    show-status {Retrieve} 1 0
+    show-status {Retrieving} 1 0
 }
 
 proc present-more {number} {
     global setNo
     global setOffset
     global setMax
+    global busy
+    global cancelFlag
+    global delayRequest
+
+    dputs "present-more"
+    if {$cancelFlag} {
+        show-status {Retrieving} 1 0
+        set delayRequest "present-more $number"
+        return
+    }
+    set delayRequest {}
 
-    puts "setOffset=$setOffset"
-    puts "present-more"
     if {$setNo == 0} {
-        puts "setNo=$setNo"
+        dputs "setNo=$setNo"
 	return
     }
     set max [z39.$setNo resultCount]
     if {$max <= $setOffset} {
-        puts "max=$max"
-        puts "setOffset=$setOffset"
+        dputs "max=$max"
+        dputs "setOffset=$setOffset"
         return
     }
     if {$number == ""} {
@@ -1094,7 +1307,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 {} {
@@ -1143,12 +1356,21 @@ proc present-response {} {
     global setOffset
     global setMax
     global cancelFlag
+    global delayRequest
 
-    puts "In present-response"
+    dputs "In present-response"
     set no [z39.$setNo numberOfRecordsReturned]
-    puts "Returned $no records, setOffset $setOffset"
+    dputs "Returned $no records, setOffset $setOffset"
     add-title-lines $setNo $no $setOffset
     set setOffset [expr $setOffset + $no]
+    if {$cancelFlag} {
+        dputs "Handling cancel"
+        set cancelFlag 0
+        if {$delayRequest != ""} {
+            eval $delayRequest
+        }
+        return
+    }
     set status [z39.$setNo responseStatus]
     if {[lindex $status 0] == "NSD"} {
         show-status {Ready} 0 1
@@ -1158,20 +1380,15 @@ proc present-response {} {
         tkerror "NSD$code: $msg: $addinfo"
         return
     }
-    if {$cancelFlag} {
-        show-status {Ready} 0 1
-        set cancelFlag 0
-        return
-    }
     if {$no > 0 && $setOffset <= $setMax} {
-        puts "present-request from ${setOffset}"
+        dputs "present-request from ${setOffset}"
         set toGet [expr $setMax - $setOffset + 1]
         if {$toGet > 3} {
             set toGet 3
         }
         z39.$setNo present $setOffset $toGet
     } else {
-        show-status {Finished} 0 1
+        show-status {Ready} 0 1
     }
 }
 
@@ -1239,13 +1456,16 @@ proc define-target-dialog {} {
 
 proc protocol-setup-delete {target} {
     global profile
+    global settingsChanged
 
-    set a [alert "Are you you want to delete the target definition $target ?"]
+    set a [alert "Are you sure you want to delete the target \
+definition $target ?"]
     if {$a} {
         set wno [lindex $profile($target) 12]
         set w .setup-${wno}
         destroy $w
         unset profile($target)
+        set settingsChanged 1
         cascade-target-list
     }
 }
@@ -1283,7 +1503,7 @@ proc protocol-setup-action {target} {
             $wno]
 
     cascade-target-list
-    puts $profile($target)
+    dputs $profile($target)
     destroy $w
 }
 
@@ -1339,10 +1559,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
+        }
     }
 }
 
@@ -1366,8 +1593,8 @@ proc protocol-setup {target} {
     if {$target == ""} {
         set target Default
     }
-    puts target
-    puts $profile($target)
+    dputs target
+    dputs $profile($target)
 
     frame $w.top.host
     frame $w.top.port
@@ -1393,7 +1620,7 @@ proc protocol-setup {target} {
     
     foreach sub {description host port idAuthentication \
             maximumRecordSize preferredMessageSize} {
-        puts $sub
+        dputs $sub
         bind $w.top.$sub.entry <Control-a> [list add-database $target]
         bind $w.top.$sub.entry <Control-d> [list delete-database $target]
     }
@@ -1409,7 +1636,7 @@ proc protocol-setup {target} {
     set ResultSetCheck [lindex $profile($target) 10]
     set protocolRadioType [lindex $profile($target) 11]
     if {$protocolRadioType == ""} {
-        set protocolRadioType z39v2
+        set protocolRadioType Z39
     }
 
     # Databases ....
@@ -1442,9 +1669,9 @@ proc protocol-setup {target} {
     
     label $w.top.cs-type.label -text "Transport" 
     radiobutton $w.top.cs-type.tcpip -text "TCP/IP" -anchor w \
-            -command {puts tcp/ip} -variable csRadioType -value tcpip
+            -variable csRadioType -value tcpip
     radiobutton $w.top.cs-type.mosi -text "MOSI" -anchor w\
-            -command {puts mosi} -variable csRadioType -value mosi
+            -variable csRadioType -value mosi
     
     pack $w.top.cs-type.label $w.top.cs-type.tcpip $w.top.cs-type.mosi \
             -padx 4 -side top -fill x
@@ -1454,9 +1681,9 @@ proc protocol-setup {target} {
     
     label $w.top.protocol.label -text "Protocol" 
     radiobutton $w.top.protocol.z39v2 -text "Z39.50" -anchor w \
-            -command {puts z39v2} -variable protocolRadioType -value z39v2
+            -variable protocolRadioType -value Z39
     radiobutton $w.top.protocol.sr -text "SR" -anchor w \
-            -command {puts sr} -variable protocolRadioType -value sr
+            -variable protocolRadioType -value SR
     
     pack $w.top.protocol.label $w.top.protocol.z39v2 $w.top.protocol.sr \
             -padx 4 -side top -fill x
@@ -1533,7 +1760,7 @@ proc cascade-target-list {} {
     .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
@@ -1662,14 +1889,16 @@ proc save-geometry {} {
     global hotTargets
     global textWrap
     global displayFormat
+    global popupMarcdf
     
     set windowGeometry(.) [wm geometry .]
 
-    set f [open "clientg.tcl" w]
+    set f [open "~/.clientrc.tcl" w]
 
     puts $f "set hotTargets \{ $hotTargets \}"
     puts $f "set textWrap $textWrap"
     puts $f "set displayFormat $displayFormat"
+    puts $f "set popupMarcdf $popupMarcdf"
     foreach n [array names windowGeometry] {
         puts -nonewline $f "set \{windowGeometry($n)\} \{"
         puts -nonewline $f $windowGeometry($n)
@@ -1680,12 +1909,16 @@ proc save-geometry {} {
 
 proc save-settings {} {
     global profile
+    global libdir
     global settingsChanged
     global queryTypes
     global queryButtons
     global queryInfo
-    
-    set f [open "clientrc.tcl" w]
+   
+    if {![file writeable "${libdir}/clientrc.tcl"]} {
+	return
+    }
+    set f [open "${libdir}/clientrc.tcl" w]
     puts $f "# Setup file"
 
     foreach n [array names profile] {
@@ -1738,7 +1971,7 @@ proc exit-action {} {
     global settingsChanged
 
     if {$settingsChanged} {
-        set a [alert "you havent saved your settings. Do you wish to save?"]
+        set a [alert "you haven't saved your settings. Do you wish to save?"]
         if {$a} {
             save-settings
         }
@@ -1821,7 +2054,7 @@ proc query-add-index-action {queryNo} {
 
     set newI [.query-add-index.top.index.entry get]
     lappend queryInfoTmp [list $newI {}]
-    $w.top.index insert end $newI
+    $w.top.index.list insert end $newI
     destroy .query-add-index
     #destroy $w.top.lines
     #frame $w.top.lines -relief ridge -border 2
@@ -1878,6 +2111,9 @@ proc query-setup-action {queryNo} {
     global queryInfo
     global queryButtonsTmp
     global queryInfoTmp
+    global queryButtonsFind
+    global queryInfoFind
+    
     global settingsChanged 
 
     set settingsChanged 1
@@ -1886,7 +2122,11 @@ proc query-setup-action {queryNo} {
             $queryInfoTmp]
     set queryButtons [lreplace $queryButtons $queryNo $queryNo \
             $queryButtonsTmp]
+    set queryInfoFind $queryInfoTmp
+    set queryButtonsFind $queryButtonsTmp
+
     destroy .query-setup
+    index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
 }
 
 proc activate-e-index {value no i} {
@@ -1894,7 +2134,7 @@ proc activate-e-index {value no i} {
     global queryIndexTmp
     
     set queryButtonsTmp [lreplace $queryButtonsTmp $no $no [list I $i]]
-    puts $queryButtonsTmp
+    dputs $queryButtonsTmp
     set queryIndexTmp $i
 }
 
@@ -1903,7 +2143,7 @@ proc activate-index {value no i} {
 
     set queryButtonsFind [lreplace $queryButtonsFind $no $no [list I $i]]
 
-    puts "queryButtonsFind $queryButtonsFind"
+    dputs "queryButtonsFind $queryButtonsFind"
 }
 
 proc update-attr {} {
@@ -2054,7 +2294,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"
+        dputs "useTmpValue=$useTmpValue"
     }
 }
 
@@ -2071,9 +2311,9 @@ proc index-setup-action {oldAttr queryNo indexNo} {
 
     use-attr 0
 
-    puts "index-setup-action"
-    puts "queryNo $queryNo"
-    puts "indexNo $indexNo"
+    dputs "index-setup-action"
+    dputs "queryNo $queryNo"
+    dputs "indexNo $indexNo"
     if {$useTmpValue > 0} {
         lappend attr "1=$useTmpValue"
     }
@@ -2092,7 +2332,7 @@ proc index-setup-action {oldAttr queryNo indexNo} {
     if {$completenessTmpValue > 0} {
         lappend attr "6=$completenessTmpValue"
     }
-    puts "new attr $attr"
+    dputs "new attr $attr"
     set queryInfoTmp [lreplace $queryInfoTmp $indexNo $indexNo $attr]
     destroy .index-setup
 }
@@ -2224,7 +2464,7 @@ proc query-edit-index {queryNo} {
         return
     }
     set attr [lindex $queryInfoTmp $i]
-    puts "Editing no $i $attr"
+    dputs "Editing no $i $attr"
     index-setup $attr $queryNo $i
 }
 
@@ -2299,7 +2539,7 @@ proc query-setup {queryNo} {
     foreach x $queryInfoTmp {
         $w.top.index.list insert end [lindex $x 0]
     }
-    # Ok-cancel
+    # Bottom
     bottom-buttons $w [list \
             {Ok} [list query-setup-action $queryNo] \
             {Add index} [list query-add-index $queryNo] \
@@ -2330,7 +2570,26 @@ proc index-query {} {
         if {$term != ""} {
             set attr [lrange [lindex $queryInfoFind [lindex $b 1]] 1 end]
 
+            set len [string length $term]
+            incr len -1
+            set left 0
+            set right 0
+            if {[string index $term $len] == "?"} {
+                set right 1
+                set term [string range $term 0 [expr $len - 1]]
+            }
+            if {[string index $term 0] == "?"} {
+                set left 1
+                set term [string range $term 1 end]
+            }
             set term "\{${term}\}"
+            if {$right && $left} {
+                set term "@attr 5=3 ${term}"
+            } elseif {$right} {
+                set term "@attr 5=1 ${term}"
+            } elseif {$left} {
+                set term "@attr 5=2 ${term}"
+            }
             foreach a $attr {
                 set term "@attr $a ${term}"
             }
@@ -2342,7 +2601,7 @@ proc index-query {} {
         }
         incr i
     }
-    puts "qs=  $qs"
+    dputs "qs=  $qs"
     return $qs
 }
 
@@ -2372,7 +2631,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
                 pack $w.$i -side top -fill x -padx 2 -pady 2
                 bind $w.$i.e <Left> [list left-cursor $w.$i.e]
                 bind $w.$i.e <Right> [list right-cursor $w.$i.e]
-                bind $w.$i.e <Return> search-request
+                bind $w.$i.e <Return> {search-request 0}
             }
         } else {
             pack $w.$i.l -side left
@@ -2453,13 +2712,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}
@@ -2476,7 +2735,7 @@ 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 "Present" -menu .top.service.m.present
@@ -2485,7 +2744,7 @@ menu .top.service.m.present
         -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 "Search" -command {search-request 0}
 .top.service.m add command -label "Scan" -command {scan-request}
 
 .top.service configure -state disabled
@@ -2495,7 +2754,7 @@ 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
@@ -2544,7 +2803,7 @@ pack .top.help -side right
 
 index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
 
-button .mid.search -width 7 -text {Search} -command search-request \
+button .mid.search -width 7 -text {Search} -command {search-request 0} \
         -state disabled
 button .mid.scan -width 7 -text {Scan} \
         -command scan-request -state disabled 
@@ -2571,7 +2830,7 @@ if {[tk colormodel .] == "color"} {
 }
 .data.record tag configure marc-data -foreground black
 
-button .bot.logo  -bitmap @book1 -command cancel-operation
+button .bot.logo  -bitmap @${libdir}/bitmaps/book1 -command cancel-operation
 frame .bot.a
 pack .bot.a -side left -fill x
 pack .bot.logo -side right -padx 2 -pady 2
@@ -2589,11 +2848,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