From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 27 Jun 1995 14:41:03 +0000 (+0000)
Subject: Bug fix in search-response. Didn't always observe non-surrogate diagnostics.
X-Git-Tag: IRTCL.1.4~237
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=42b3a727a65e1e1b34ea24635a878e045bde5dfb;p=ir-tcl-moved-to-github.git

Bug fix in search-response. Didn't always observe non-surrogate diagnostics.
---

diff --git a/client.tcl b/client.tcl
index 6ce4644..d227e4c 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.53  1995-06-26 12:40:09  adam
+# Revision 1.54  1995-06-27 14:41:03  adam
+# Bug fix in search-response. Didn't always observe non-surrogate diagnostics.
+#
+# Revision 1.53  1995/06/26  12:40:09  adam
 # Client defines its own tkerror.
 # User may specify 'no preferredRecordSyntax'.
 #
@@ -541,6 +544,7 @@ proc about-target {} {
     toplevel $w
 
     wm title $w "About target"
+    place-force $w .
     top-down-window $w
 
     frame $w.top.a -relief ridge -border 2
@@ -1276,26 +1280,25 @@ proc search-response {} {
     set delayRequest {}
     init-title-lines
     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]
-            set msg [lindex $status 2]
-            set addinfo [lindex $status 3]
-            tkerror "NSD$code: $msg: $addinfo"
-        }
+    show-status {Ready} 0 1
+    set status [z39.$setNo responseStatus]
+    if {[lindex $status 0] == "NSD"} {
+        set setOffset 0
+        set code [lindex $status 1]
+        set msg [lindex $status 2]
+        set addinfo [lindex $status 3]
+        tkerror "NSD$code: $msg: $addinfo"
         return
     }
     if {$setMax > 20} {
         set setMax 20
     }
+    show-message "${setMax} hits"
     set setOffset 1
     show-status {Ready} 0 1
+    set l [format "%-4d %7d" $setNo $setMax]
+    .top.rset.m add command -label $l \
+            -command [list add-title-lines $setNo 10000 1]
     z39 callback {present-response}
     z39.$setNo present $setOffset 1
     show-status {Retrieving} 1 0
diff --git a/clientrc.tcl b/clientrc.tcl
index 7346499..a5a96af 100644
--- a/clientrc.tcl
+++ b/clientrc.tcl
@@ -2,7 +2,7 @@
 set {profile(Penn)} {{Penn State's Library} 128.118.88.200 210 {} 16384 8192 tcpip CATALOG 1 {} {} Z39 2}
 set {profile(ztest)} {{test server} localhost 9999 {} 16384 4096 tcpip dummy 1 {} {} Z39 3}
 set {profile(madison)} {{University of Wisconsin-Madison} z3950.adp.wisc.edu 210 {} 16384 8192 tcpip madison 1 {} {} Z39 22}
-set {profile(Default)} {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} {} 25}
+set {profile(Default)} {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} {} 26}
 set {profile(RLG)} {{Research Libraries group} rlg.stanford.edu 210 {} 4096 4096 tcpip {BKS AMC MAPS MDF REC SCO SER VIM NAF SAF AUT CATALOG ABI AVI DSA EIP FLP HAP HST NPA PAI PRA WLI} 1 {} {} Z39 5}
 set {profile(AT&T server)} {{AT&T Z39 Server} z3950.research.att.com 210 {} 16384 16384 tcpip Default 1 {} {} Z39 21}
 set {profile(LOC)} {{Library of Congress} IBM2.LOC.gov 2210 {} 16384 16384 tcpip {BOOKS NAMES} 1 {} 0 Z39 6}
@@ -12,6 +12,7 @@ set {profile(CARL)} {{CARL systems} Z3950.carl.org 210 {} 16384 8192 tcpip {ACC
 set {profile(CLSI)} {CLSI inet-gw.clsi.us.geac.com 210 {} 16384 8192 tcpip cl_default 1 {} {} Z39 13}
 set {profile(Innovative)} {{Innovatives server: demo.iii.com} demo.iii.com 210 {} 16384 8192 tcpip DEFAULT 1 {} {} Z39 12}
 set {profile(AULS)} {{Acadia university} auls.acadiau.ca 210 {} 16384 8192 tcpip AULS 1 {} {} Z39 14}
+set {profile(canberra)} {canberra canberra.cs.umass.edu 2110 {} 30000 30000 tcpip cacm_dots 1 {} {} Z39 25}
 set {profile(dranet)} {dranet dranet.dra.com 210 {} 16384 16384 tcpip drewdb 1 {} {} Z39 15}
 set queryTypes {Simple phrase}
 set queryButtons {{ {I 0} {I 1} {I 2} } {{I 0} {I 1} {I 0}}}