From 477f6feccaf785916170e8f1f94873e798eb77ed Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 19 Nov 1997 11:20:56 +0000
Subject: [PATCH] New target profile format - associative arrrays instead of
 LONG lists.

---
 CHANGELOG    |    6 +-
 LICENSE      |    2 +-
 client.tcl   |  619 +++++++++++++++++++++++++++++-----------------------------
 clientrc.tcl |  596 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 explain.tcl  |  186 +++++++++++-------
 setup.tcl    |  168 +++++-----------
 6 files changed, 1065 insertions(+), 512 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 614b142..2cda361 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-$Id: CHANGELOG,v 1.34 1997-08-28 20:20:47 adam Exp $
+$Id: CHANGELOG,v 1.35 1997-11-19 11:20:56 adam Exp $
 
 06/19/95 Release of ir-tcl-1.0b
 ------------------------------------------------------
@@ -103,7 +103,7 @@ $Id: CHANGELOG,v 1.34 1997-08-28 20:20:47 adam Exp $
 
 08/09/96 Borland C 5 makefile supplied with IrTcl.
 
-08/21/95 New method, saveFile, that saves DB of records to a file.
+08/21/96 New method, saveFile, that saves DB of records to a file.
 
 08/21/96 loadFile method changed to use load records previously saved
          with saveFile.
@@ -114,8 +114,6 @@ $Id: CHANGELOG,v 1.34 1997-08-28 20:20:47 adam Exp $
 
 11/14/96 Added some Explain documentation.
 
-04/13/97 Added support for Tcl8.0/Tk8.0.
-
 04/13/97 Added ir-log-init command.
 
 04/30/97 Added shared library support.
diff --git a/LICENSE b/LICENSE
index d2b0a44..534d656 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1996, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
diff --git a/client.tcl b/client.tcl
index 56e8e5e..6473a39 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.100  1997-09-09 10:19:50  adam
+# Revision 1.101  1997-11-19 11:20:56  adam
+# New target profile format - associative arrrays instead of LONG lists.
+#
+# Revision 1.100  1997/09/09 10:19:50  adam
 # New MSV5.0 port with fewer warnings.
 #
 # Revision 1.99  1997/04/13 19:00:37  adam
@@ -355,9 +358,20 @@ if {$tk_version == "3.6"} {
     }
 }
 
-# The following two procedures deals with menu entries. The interface
+# The following procedures deals with menu entries. The interface
 # changed from Tk 3.6 to 4.X
 
+# Procedure irmenu
+if {[tk4]} {
+    proc irmenu {w} {
+	    menu $w -tearoff off
+    }
+} else {
+    proc irmenu {w} {
+	    menu $w
+	}
+}
+    
 # Procedure configure-enable-e {w n}
 #  w   is a menu
 #  n   menu entry number (0 is first entry)
@@ -370,11 +384,11 @@ if {$tk_version == "3.6"} {
 
 if {[tk4]} {
     proc configure-enable-e {w n} {
-        incr n
+#        incr n
         $w entryconfigure $n -state normal
     }
     proc configure-disable-e {w n} {
-        incr n
+#        incr n
         $w entryconfigure $n -state disabled
     }
     set noFocus [list -takefocus 0]
@@ -430,44 +444,33 @@ set hotTargets {}
 set hotInfo {}
 set busy 0
 
-# profile: associative array with target profiles.
-#indx exp description
-#
-#   0  T  Target description
-#   1     Host
-#   2     Port
-#   3     Authentication
-#   4     Maximum Record Size
-#   5     Preferred Messages Size
-#   6     Comstack
-#   7  D  Databases available
-#   8  T  Result Sets support
-#   9     RPN-Query support
-#  10     CCL-Query support
-#  11     Protocol (Z39/SR)
-#  12     Window Number
-#  13     LSLB  Large Set Lower Bound
-#  14     SSUB  Small Set Upper Bound
-#  15     MSPN  Medium Set Present Number
-#  16     Present Chunk - number of records to fetch in each present
-#  17     Time of first define
-#  18     Time of last init
-#  19     Time of last explain
-#  20  T  Name in TargetInfo
-#  21  T  Recent News
-#  22  T  Max Result Sets
-#  23  T  Max Result Size
-#  24  T  Max Terms
-#  25  D  List of database info records
-#  26  T  Multiple Databases
-#  27  T  Welcome message
-#
-#
-# Legend:
-#  T  TargetInfo explain
-#  D  DatabaseInfo explain
+set profile(Default,description) {}
+set profile(Default,host) {}
+set profile(Default,port) 210
+set profile(Default,authentication) {}
+set profile(Default,maximumRecordSize) 50000
+set profile(Default,preferredMessageSize) 30000
+set profile(Default,comstack) tcpip
+set profile(Default,namedResultSets) 1
+set profile(Default,queryRPN) 1
+set profile(Default,queryCCL) 0
+set profile(Default,protocol) Z39
+set profile(Default,windowNumber) 1
+set profile(Default,largeSetLowerBound) 2
+set profile(Default,smallSetUpperBound) 0
+set profile(Default,mediumSetPresentNumber) 0
+set profile(Default,presentChunk) 4
+set profile(Default,timeDefine) {}
+set profile(Default,timeLastInit) {}
+set profile(Default,timeLastExplain) {}
+set profile(Default,targetInfoName) {}
+set profile(Default,recentNews) {}
+set profile(Default,maxResultSets) {}
+set profile(Default,maxResultSize) {}
+set profile(Default,maxTerms) {}
+set profile(Default,multipleDatabases) 0
+set profile(Default,welcomeMessage) {}
 
-set profile(Default) {{} {} {210} {} 50000 30000 tcpip {} 1 {} {} Z39 1 2 0 0 4}
 set hostid Default
 set settingsChanged 0
 set setNo 0
@@ -491,8 +494,7 @@ wm minsize . 0 0
 set setOffset 0
 set setMax 0
 
-if {$tk_version == "3.6" || $tk_version == "4.0" || $tk_version == "4.1" ||
-    $tk_version == "4.2"} {
+if {[lindex [split $tk_version .] 0] > 4} {
     set font(bb,normal) -Adobe-Helvetica-Medium-R-Normal-*-240-*
     set font(bb,bold) -Adobe-Helvetica-Bold-R-Normal-*-240-*
     set font(b,normal) -Adobe-Helvetica-Medium-R-Normal-*-180-*
@@ -515,27 +517,28 @@ if {$tk_version == "3.6" || $tk_version == "4.0" || $tk_version == "4.1" ||
 # Procedure tkerror {err}
 #   err   error message
 # Override the Tk error handler function.
-proc tkerror err {
-    global font
-    set w .tkerrorw
-
-    if {[winfo exists $w]} {
-        destroy $w
-    }
-    toplevel $w
-    wm title $w "Error"
-
-    place-force $w .
-    top-down-window $w
-
-    label $w.top.b -bitmap error
-    message $w.top.t -aspect 300 -text "Error: $err" \
+if {1} {
+    proc tkerror err {
+	global font
+	set w .tkerrorw
+	
+	if {[winfo exists $w]} {
+	    destroy $w
+	}
+	toplevel $w
+	wm title $w "Error"
+	
+	place-force $w .
+	top-down-window $w
+	
+	label $w.top.b -bitmap error
+	message $w.top.t -aspect 300 -text "Error: $err" \
             -font $font(b,bold)
-    pack $w.top.b $w.top.t -side left -padx 10 -pady 10
-
-    bottom-buttons $w [list {Close} [list destroy $w]] 1
+	pack $w.top.b $w.top.t -side left -padx 10 -pady 10
+	
+	bottom-buttons $w [list {Close} [list destroy $w]] 1
+    }
 }
-
 # Read tag set file (if present)
 if {[file readable "${libdir}/tagsets.tcl"]} {
     source "${libdir}/tagsets.tcl"
@@ -548,20 +551,37 @@ if {[file readable "clientrc.tcl"]} {
     source "${libdir}/clientrc.tcl"
 }
 
-# Make old definitions up-to-date.
-foreach n [array names profile] {
-    set l [llength $profile($n)]
-    while {$l < 29} {
-        lappend profile($n) {}
-        incr l
-    }
-}
-
 # Read the user configuration file.
 if {[file readable "~/.clientrc.tcl"]} {
     source "~/.clientrc.tcl"
 }
 
+# Convert old format to new format...
+foreach target [array names profile] {
+    set timedef [clock seconds]
+    if {[string first , $target] == -1} {
+	if {![info exists profile($target,port)]} {
+	    foreach n [array names profile Default,*] {
+		set profile($target,[string range $n 8 end]) $profile($n)
+	    }
+	    set profile($target,description) [lindex $profile($target) 0]
+	    set profile($target,host) [lindex $profile($target) 1]
+	    set profile($target,port) [lindex $profile($target) 2]
+	    set profile($target,authentication) [lindex $profile($target) 3]
+	    set profile($target,maximumRecordSize) \
+		[lindex $profile($target) 4]
+	    set profile($target,preferredMessageSize) \
+		[lindex $profile($target) 5]
+	    set profile($target,comstack) [lindex $profile($target) 6]
+	    set profile($target,databases) [lindex $profile($target) 7]
+	    set profile($target,timeDefine) $timedef
+
+	    incr profile(Default,windowNumber)
+	}
+	unset profile($target)
+    }
+}
+
 # These globals describe the current query type. They are set to the
 # first query type.
 set queryButtonsFind [lindex $queryButtons 0]
@@ -632,7 +652,8 @@ proc apduDump {} {
         top-down-window $w
         
         text $w.top.t -font fixed -width 60 -height 12 -wrap word \
-		-relief flat -borderwidth 0 -yscrollcommand [list $w.top.s set]
+            -relief flat -borderwidth 0 \
+			-yscrollcommand [list $w.top.s set] -background grey85
         scrollbar $w.top.s -command [list $w.top.t yview]
         
         pack $w.top.s -side right -fill y
@@ -653,9 +674,7 @@ proc apduDump {} {
 #  f    display format
 # Reformats main record window to use display format given by f
 proc set-display-format {f} {
-    global displayFormat
-    global setNo
-    global busy
+    global displayFormat setNo busy
 
     set displayFormat $f
     if {$setNo == 0} {
@@ -808,11 +827,9 @@ proc bottom-buttons {w buttonList g} {
 # If the system is currently busy a "Cancel" will be displayed in the
 # status area and the cancelFlag is set to true indicating that future
 # responses from the target should be ignored. The system is no longer
-# when this procedure exists.
+# busy when this procedure exists.
 proc cancel-operation {} {
-    global cancelFlag
-    global busy
-    global delayRequest
+    global cancelFlag busy delayRequest
 
     if {$busy} {
         set cancelFlag 1
@@ -826,10 +843,8 @@ proc cancel-operation {} {
 #  base       name of database
 # Displays target name and database name in the target status area.
 proc show-target {target base} {
-    global profile
-
     if {![string length $target]} {
-        .bot.a.target configure -text ""
+        .bot.a.target configure -text {}
         return
     }
     if {![string length $base]} {
@@ -846,8 +861,7 @@ proc show-target {target base} {
 # by itself. The global 'busy' variable determines whether the logo is
 # moving or not.
 proc show-logo {v1} {
-    global busy
-    global libdir
+    global busy libdir
 
     if {$busy != 0} {
         incr v1
@@ -876,11 +890,8 @@ proc show-logo {v1} {
 # busy flag 'busy' to b if b is non-empty. If sb is non-empty it indicates
 # whether service buttons should be enabled or disabled.
 proc show-status {status b sb} {
-    global busy
-    global scanEnable
-    global setOffset
-    global setMax
-    global setNo
+    global busy scanEnable
+    global setOffset setMax setNo
 
     .bot.a.status configure -text "$status"
     if {$b == 1} {
@@ -1108,7 +1119,8 @@ proc popup-marc {sno no b df} {
         pack  $w.bot -fill both
 
         text $w.top.record -width 60 -height 5 -wrap word -relief flat \
-                -borderwidth 0 -font fixed -yscrollcommand [list $w.top.s set]
+                -borderwidth 0 -font fixed \
+                -yscrollcommand [list $w.top.s set] -background grey85
         scrollbar $w.top.s -command [list $w.top.record yview]
 
         global monoFlag
@@ -1140,7 +1152,7 @@ proc popup-marc {sno no b df} {
                 {Duplicate} {}] 0
         menubutton $w.bot.formats -text "Format" -menu $w.bot.formats.m \
                 -relief raised
-        menu $w.bot.formats.m
+        irmenu $w.bot.formats.m
         pack $w.bot.formats -expand yes -ipadx 2 -ipady 2 \
                 -padx 3 -pady 3 -side left
     } else {
@@ -1227,7 +1239,7 @@ proc set-target-hotlist {olen} {
    
     if {$olen > 0} {
         if {[tk4]} {
-            .top.target.m delete 7 [expr 7+$olen]
+            .top.target.m delete 6 [expr 6+$olen]
         } else {
             .top.target.m delete 6 [expr 6+$olen]
         }
@@ -1273,19 +1285,19 @@ proc define-target-action {} {
     if {![string length $target]} {
         return
     }
-    foreach n [array names profile] {
-        if {$n == $target} {
+    foreach n [array names profile *,host] {
+        if {![string compare $n ${target},host]} {
             destroy .target-define
             protocol-setup $n
             return
         }
     }
-    set seq [lindex $profile(Default) 12]
-    dputs "seq=${seq}"
-    dputs $profile(Default)
-    set profile($target) $profile(Default)
-    set profile(Default) [lreplace $profile(Default) 12 12 [incr seq]]
-   
+    foreach n [array names profile Default,*] {
+	set profile($target,[string range $n 8 end]) $profile($n)
+
+    }
+    incr profile(Default,windowNumber)
+    
     protocol-setup $target
     destroy .target-define
 }
@@ -1325,42 +1337,34 @@ proc open-target {target base} {
     global hostid
     global presentChunk
 
-    set desc [lindex $profile($target) 0]
-    if {[string length $desc]} {
-        .data.record insert end $desc
-    } else {
-        .data.record insert end $target
-    }
-    .data.record insert end "\n\n"
-
     z39 disconnect
-    z39 comstack [lindex $profile($target) 6]
-    z39 protocol [lindex $profile($target) 11]
-    eval z39 idAuthentication [lindex $profile($target) 3]
-    z39 maximumRecordSize [lindex $profile($target) 4]
-    z39 preferredMessageSize [lindex $profile($target) 5]
+    z39 comstack $profile($target,comstack)
+    z39 protocol $profile($target,protocol)
+    eval z39 idAuthentication $profile($target,authentication)
+    z39 maximumRecordSize $profile($target,maximumRecordSize)
+    z39 preferredMessageSize $profile($target,preferredMessageSize)
     dputs "maximumRecordSize=[z39 maximumRecordSize]"
     dputs "preferredMessageSize=[z39 preferredMessageSize]"
     show-status Connecting 1 0
-    set x [lindex $profile($target) 13]
+    set x $profile($target,largeSetLowerBound)
     if {![string length $x]} {
         set x 2
     }
     z39 largeSetLowerBound $x
     
-    set x [lindex $profile($target) 14]
+    set x $profile($target,smallSetUpperBound)
     if {![string length $x]} {
         set x 0
     }
     z39 smallSetUpperBound $x
     
-    set x [lindex $profile($target) 15]
+    set x $profile($target,mediumSetPresentNumber)
     if {![string length $x]} {
         set x 0
     }
     z39 mediumSetPresentNumber $x
 
-    set presentChunk [lindex $profile($target) 16]
+    set presentChunk $profile($target,presentChunk)
     if {![string length $presentChunk]} {
         set presentChunk 4
     }
@@ -1370,7 +1374,7 @@ proc open-target {target base} {
     show-target $target $base
     update idletasks
     set err [catch {
-        z39 connect [lindex $profile($target) 1]:[lindex $profile($target) 2]
+        z39 connect $profile($target,host):$profile($target,port)
         } errorMessage]
     if {$err} {
         set hostid Default
@@ -1484,8 +1488,7 @@ proc init-request {target base} {
 # are enabled. The global $scanEnable indicates whether the target
 # supports scan.
 proc init-response {target base} {
-    global cancelFlag profile
-    global scanEnable settingsChanged
+    global cancelFlag profile scanEnable settingsChanged
 
     dputs {init-response}
     apduDump
@@ -1498,10 +1501,23 @@ proc init-response {target base} {
         close-target
         tkerror "Connection rejected by target: $u"
     } else {
+	z39 failback [list explain-crash $target $base]
         explain-check $target [list ready-response $base]
     }
 }
 
+# Procedure explain-crash
+# Handles target that dies during explain.
+proc explain-crash {target base} {
+    global profile settingsChanged
+    
+    set profile($target,timeLastInit) [clock seconds]
+    set settingsChanged 1
+
+    show-message {}
+    open-target $target $base
+}
+
 # Procedure explain-check 
 # Stub function to check explain. May be overwritten later.
 proc explain-check {target response} {
@@ -1513,32 +1529,37 @@ proc explain-check {target response} {
 proc ready-response {base target} {
     global profile settingsChanged scanEnable
     
-    if {![string length $base]} {
-        set base [lindex [lindex $profile($target) 7] 0]
-    }
-    if {![string length $base]} {
-        set base Default
+    z39 failback [list fail-response $target]
+    if {[string length $base]} {
+	set profile($target,timeLastInit) [clock seconds]
+	set settingsChanged 1
+
+	z39 databaseNames $base
+	cascade-dblist $target $base
+	show-target $target $base
     }
-    z39 databaseNames $base
-    set profile($target) [lreplace $profile($target) 18 18 [clock seconds]]
-    set settingsChanged 1
     if {[lsearch [z39 options] scan] >= 0} {
         set scanEnable 1
     } else {
         set scanEnable 0
     }
-    cascade-dblist $target $base
-    show-target $target $base
-    show-message {}
-    show-status Ready 0 1
-
-    .data.record insert end [lindex $profile($target) 27]
-    .data.record insert end "\n"
-    set data [lindex $profile($target) 21]
+    .data.record delete 1.0 end
+    set desc [string trim $profile($target,description)]
+    if {[string length $desc]} {
+        .data.record insert end "$desc\n\n"
+    } else {
+        .data.record insert end "$target\n\n"
+    }
+    set data [string trim $profile($target,welcomeMessage)]
     if {[string length $data]} {
-        .data.record insert end "News:\n"
-        .data.record insert end "$data\n"
+	.data.record insert end "Welcome Message:\n$data\n\n"
     }
+    set data [string trim $profile($target,recentNews)]
+    if {[string length $data]} {
+        .data.record insert end "News:\n$data\n"
+    }
+    show-message {}
+    show-status Ready 0 1
 }
 
 # Procedure search-request
@@ -1584,19 +1605,18 @@ proc search-request {bflag} {
     incr setNoLast
     set setNo $setNoLast
     ir-set z39.$setNo z39
-
-    if {[lindex $profile($target) 10] == 1} {
+    
+    if {$profile($target,namedResultSets)} {
         z39.$setNo setName $setNo
         dputs "setName=${setNo}"
     } else {
-        z39.$setNo setName Default
-        dputs "setName=Default"
-    }
-    if {[lindex $profile($target) 8] == 1} {
-        z39.$setNo queryType rpn
+        z39.$setNo setName default
+        dputs "setName=default"
     }
-    if {[lindex $profile($target) 9] == 1} {
-        z39.$setNo queryType ccl
+    if {$profile($target,queryRPN)} {
+	z39.$setNo queryType rpn
+    } elseif {$profile($target,queryCCL)} {
+	z39.$setNo queryType ccl
     }
     dputs Setting
     dputs $recordSyntax
@@ -1962,7 +1982,6 @@ proc search-response {} {
         set msg [lindex $status 2]
         set addinfo [lindex $status 3]
         tkerror "NSD$code: $msg: $addinfo"
-	dputs "xxxxxxxxxxxxxxx"
         return
     }
     show-message "${setMax} hits"
@@ -2057,7 +2076,7 @@ proc present-more {number} {
 # Procedure init-title-lines 
 # Utility that cleans the main record window.
 proc init-title-lines {} {
-    .data.record delete 0.0 end
+    .data.record delete 1.0 end
 }
 
 # Procedure recall-set {setno}
@@ -2087,7 +2106,7 @@ proc add-title-lines {setno no offset} {
     }
     if {$offset == 1} {
         .bot.a.set configure -text $setno
-        .data.record delete 0.0 end
+        .data.record delete 1.0 end
     }
     set ffunc [lindex $displayFormats $displayFormat]
     dputs "ffunc=$ffunc"
@@ -2255,14 +2274,15 @@ proc define-target-dialog {} {
 # This procedure is invoked when the user tries to delete a target
 # definition. If user is sure, the target definition is deleted.
 proc protocol-setup-delete {target w} {
-    global profile
-    global settingsChanged
+    global profile settingsChanged
 
     set a [alert "Are you sure you want to delete the target \
 definition $target ?"]
     if {$a} {
         destroy $w
-        unset profile($target)
+	foreach n [array names profile $target,*] {
+	    unset profile($n)
+	}
         set settingsChanged 1
         cascade-target-list
         delete-target-hotlist $target
@@ -2273,51 +2293,33 @@ definition $target ?"]
 # target     target to be defined
 # w          target definition toplevel widget
 # This procedure reads all appropriate globals and makes a new/modified
-# profile for the target. The global array $targetS contains most of the
+# profile for the target. The global array $profileS contains most of the
 # information the user may modify.
 proc protocol-setup-action {target w} {
-    global profile
-    global settingsChanged
-    global targetS
+    global profile settingsChanged profileS
 
     set dataBases {}
     set settingsChanged 1
-    set len [$w.top.databases.list size]
-    for {set i 0} {$i < $len} {incr i} {
-        lappend dataBases [$w.top.databases.list get $i]
-    }
-    set wno [lindex $profile($target) 12]
-    set timedef [lindex $profile($target) 17]
+
+    set timedef $profile($target,timeDefine)
     if {![string length $timedef]} {
         set timedef [clock seconds]
     }
+    set profileS($target,timeDefine) $timedef
+
+    foreach n [array names profile $target,*] {
+	set profile($n) $profileS($n)
+	unset profileS($n)
+    }
 
-    set idauth [$w.top.idAuthentication.entry get]
-
-    set profile($target) [list [$w.top.description.entry get] \
-            [$w.top.host.entry get] \
-            [$w.top.port.entry get] \
-            $idauth \
-            $targetS($target,MRS) \
-            $targetS($target,PMS) \
-            $targetS($target,csType) \
-            $dataBases \
-            $targetS($target,RPN) \
-            $targetS($target,CCL) \
-            $targetS($target,ResultSets) \
-            $targetS($target,protocolType) \
-            $wno \
-            $targetS($target,LSLB) \
-            $targetS($target,SSUB) \
-            $targetS($target,MSPN) \
-            $targetS($target,presentChunk) \
-            $timedef \
-            {} \
-            {} ]
+    set len [$w.top.databases.list size]
+    catch {unset profile($target,databases)}
+    for {set i 0} {$i < $len} {incr i} {
+	lappend profile($target,databases) [$w.top.databases.list get $i]
+    }
 
     cascade-target-list
     delete-target-hotlist $target
-    dputs $profile($target)
     destroy $w
 }
 
@@ -2402,11 +2404,10 @@ proc delete-database {target w} {
 # Procedure protocol-setup {target}
 #  target     target to be defined
 # Makes a dialog in which the user may modify/view a target definition
-# (profile). The $targetS - array holds the initial definition of the
+# (profile). The $profileS - array holds the initial definition of the
 # target.
 proc protocol-setup {target} {
-    global profile
-    global targetS
+    global profile profileS
     
     set bno 0
     while {[winfo exists .setup-$bno]} {
@@ -2423,8 +2424,9 @@ proc protocol-setup {target} {
     if {![string length $target]} {
         set target Default
     }
-    dputs target
-    dputs $profile($target)
+    foreach n [array names profile $target,*] {
+	set profileS($n) $profile($n)
+    }
 
     frame $w.top.description
     frame $w.top.host
@@ -2449,24 +2451,14 @@ proc protocol-setup {target} {
         bind $w.top.$sub.entry <Control-a> [list add-database $target $w]
         bind $w.top.$sub.entry <Control-d> [list delete-database $target $w]
     }
-    $w.top.description.entry insert 0 [lindex $profile($target) 0]
-    $w.top.host.entry insert 0 [lindex $profile($target) 1]
-    $w.top.port.entry insert 0 [lindex $profile($target) 2]
-    $w.top.idAuthentication.entry insert 0 [lindex $profile($target) 3]
-    set targetS($target,csType) [lindex $profile($target) 6]
-    set targetS($target,RPN) [lindex $profile($target) 8]
-    set targetS($target,CCL) [lindex $profile($target) 9]
-    set targetS($target,ResultSets) [lindex $profile($target) 10]
-    set targetS($target,protocolType) [lindex $profile($target) 11]
-    if {![string length $targetS($target,protocolType)]} {
-        set targetS($target,protocolType) Z39
-    }
-    set targetS($target,LSLB) [lindex $profile($target) 13]
-    set targetS($target,SSUB) [lindex $profile($target) 14]
-    set targetS($target,MSPN) [lindex $profile($target) 15]
-    set targetS($target,presentChunk) [lindex $profile($target) 16]
-    set targetS($target,MRS) [lindex $profile($target) 4]
-    set targetS($target,PMS) [lindex $profile($target) 5]
+    $w.top.description.entry configure -textvariable \
+	profileS($target,description)
+    $w.top.host.entry configure -textvariable \
+	profileS($target,host)
+    $w.top.port.entry configure -textvariable \
+	profileS($target,port)
+    $w.top.idAuthentication.entry configure -textvariable \
+	profileS($target,authentication)
 
     # Databases ....
     pack $w.top.databases -side left -pady 2 -padx 2 -expand yes -fill both
@@ -2494,18 +2486,19 @@ proc protocol-setup {target} {
             -padx 2 -pady 2
     $w.top.databases.scroll config -command "$w.top.databases.list yview"
 
-    foreach b [lindex $profile($target) 7] {
-        $w.top.databases.list insert end $b
+    if {[info exists profile($target,databases)]} {
+	foreach b $profile($target,databases) {
+	    $w.top.databases.list insert end $b
+	}
     }
-
     # Transport ...
     pack $w.top.cs-type -pady 2 -padx 2 -side top -fill x
     
     label $w.top.cs-type.label -text "Transport" 
     radiobutton $w.top.cs-type.tcpip -text "TCP/IP" -anchor w \
-            -variable targetS($target,csType) -value tcpip
+            -variable profileS($target,comstack) -value tcpip
     radiobutton $w.top.cs-type.mosi -text "MOSI" -anchor w\
-            -variable targetS($target,csType) -value mosi
+            -variable profileS($target,comstack) -value mosi
     
     pack $w.top.cs-type.label $w.top.cs-type.tcpip $w.top.cs-type.mosi \
             -padx 2 -side top -fill x
@@ -2515,9 +2508,9 @@ proc protocol-setup {target} {
     
     label $w.top.protocol.label -text "Protocol" 
     radiobutton $w.top.protocol.z39v2 -text "Z39.50" -anchor w \
-            -variable targetS($target,protocolType) -value Z39
+            -variable profileS($target,protocol) -value Z39
     radiobutton $w.top.protocol.sr -text "SR" -anchor w \
-            -variable targetS($target,protocolType) -value SR
+            -variable profileS($target,protocol) -value SR
     
     pack $w.top.protocol.label $w.top.protocol.z39v2 $w.top.protocol.sr \
             -padx 2 -side top -fill x
@@ -2527,11 +2520,11 @@ proc protocol-setup {target} {
 
     label $w.top.query.label -text "Query support"
     checkbutton $w.top.query.c1 -text "RPN query" -anchor w \
-            -variable targetS($target,RPN)
+            -variable profileS($target,queryRPN)
     checkbutton $w.top.query.c2 -text "CCL query" -anchor w \
-            -variable targetS($target,CCL)
+            -variable profileS($target,queryCCL)
     checkbutton $w.top.query.c3 -text "Result sets" -anchor w \
-            -variable targetS($target,ResultSets)
+            -variable profileS($target,namedResultSets)
 
     pack $w.top.query.label -side top 
     pack $w.top.query.c1 $w.top.query.c2 $w.top.query.c3 \
@@ -2551,7 +2544,7 @@ proc protocol-setup {target} {
 # of a target definition (profile).
 proc advanced-setup {target b} {
     global profile
-    global targetS
+    global profileS
 
     set w .advanced-setup-$b
     
@@ -2586,12 +2579,18 @@ proc advanced-setup {target b} {
             {Maximum Record Size:} {Preferred Message Size:}} \
             [list advanced-setup-action $target $b] [list destroy $w]
 
-    $w.top.largeSetLowerBound.entry insert 0 $targetS($target,LSLB)
-    $w.top.smallSetUpperBound.entry insert 0 $targetS($target,SSUB)
-    $w.top.mediumSetPresentNumber.entry insert 0 $targetS($target,MSPN)
-    $w.top.presentChunk.entry insert 0 $targetS($target,presentChunk)
-    $w.top.maximumRecordSize.entry insert 0 $targetS($target,MRS)
-    $w.top.preferredMessageSize.entry insert 0 $targetS($target,PMS)
+    $w.top.largeSetLowerBound.entry configure -textvariable \
+	profileS($target,largeSetLowerBound)
+    $w.top.smallSetUpperBound.entry configure -textvariable \
+	profileS($target,smallSetUpperBound)
+    $w.top.mediumSetPresentNumber.entry configure -textvariable \
+	profileS($target,mediumSetPresentNumber)
+    $w.top.presentChunk.entry configure -textvariable \
+	profileS($target,presentChunk)
+    $w.top.maximumRecordSize.entry configure -textvariable \
+	profileS($target,maximumRecordSize)
+    $w.top.preferredMessageSize.entry configure -textvariable \
+	profileS($target,preferredMessageSize)
     
     bottom-buttons $w [list {Ok} [list advanced-setup-action $target $b] \
             {Cancel} [list destroy $w]] 0   
@@ -2601,17 +2600,17 @@ proc advanced-setup {target b} {
 #  target     target to be defined
 #  b          window number of target top level
 # This procedure is called when the user hits Ok in the advanced target
-# setup dialog. The temporary result is stored in the $targetS - array.
+# setup dialog. The temporary result is stored in the $profileS - array.
 proc advanced-setup-action {target b} {
     set w .advanced-setup-$b
-    global targetS
+    global profileS
     
-    set targetS($target,LSLB) [$w.top.largeSetLowerBound.entry get]
-    set targetS($target,SSUB) [$w.top.smallSetUpperBound.entry get]
-    set targetS($target,MSPN) [$w.top.mediumSetPresentNumber.entry get]
-    set targetS($target,presentChunk) [$w.top.presentChunk.entry get]
-    set targetS($target,MRS) [$w.top.maximumRecordSize.entry get]
-    set targetS($target,PMS) [$w.top.preferredMessageSize.entry get]
+    set profileS($target,LSLB) [$w.top.largeSetLowerBound.entry get]
+    set profileS($target,SSUB) [$w.top.smallSetUpperBound.entry get]
+    set profileS($target,MSPN) [$w.top.mediumSetPresentNumber.entry get]
+    set profileS($target,presentChunk) [$w.top.presentChunk.entry get]
+    set profileS($target,MRS) [$w.top.maximumRecordSize.entry get]
+    set profileS($target,PMS) [$w.top.preferredMessageSize.entry get]
 
     dputs "advanced-setup-action"
     destroy $w
@@ -2661,7 +2660,7 @@ proc database-select {} {
             -padx 2 -pady 2
     $w.top.databases.scroll config -command "$w.top.databases.list yview"
 
-    foreach b [lindex $profile($hostid) 7] {
+    foreach b $profile($hostid,databases) {
         $w.top.databases.list insert end $b
     }
     top-down-ok-cancel $w {database-select-action} 1
@@ -2681,9 +2680,11 @@ proc cascade-dblist {target base} {
 
     set w .top.service.m.dblist
     $w delete 0 200
-    foreach db [lindex $profile($target) 7] {
-        $w add command -label $db \
-                -command [list cascade-dblist-select $target $db]
+    if {[info exists profile($target,databases)]} {
+	foreach db $profile($target,databases) {
+	    $w add command -label $db \
+		-command [list cascade-dblist-select $target $db]
+	}
     }
 }
 
@@ -2698,25 +2699,39 @@ proc cascade-target-list {} {
         destroy $sub
     }
     .top.target.m.clist delete 0 last
-    foreach n [lsort [array names profile]] {
-        if {$n != "Default"} {
-            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
-                menu .top.target.m.clist.$nl
-                foreach b [lindex $profile($n) 7] {
-                    .top.target.m.clist.$nl add command -label $b \
-                            -command [list reopen-target $n $b]
-                }
-            } else {
-                .top.target.m.clist add command -label $n \
-                        -command [list reopen-target $n {}]
-            }
-        }
+    foreach nn [lsort [array names profile *,host]] {
+	if {[string length $profile($nn)]} {
+	    set ll [expr [string length $nn] - 6]
+	    set n [string range $nn 0 $ll]
+	    
+	    set nl $profile($n,windowNumber)
+	    if {[info exists profile($n,databases)]} {
+		set ndb [llength $profile($n,databases)]
+	    } else {
+		set ndb 0
+	    }
+	    if {$ndb > 1} {
+		.top.target.m.clist add cascade -label $n \
+		    -menu .top.target.m.clist.$nl
+		irmenu .top.target.m.clist.$nl
+		foreach b $profile($n,databases) {
+		    .top.target.m.clist.$nl add command -label $b \
+			-command [list reopen-target $n $b]
+		}
+	    } elseif {$ndb == 1} {
+		.top.target.m.clist add command -label $n -command \
+		    [list reopen-target $n [lindex $profile($n,databases) 0]]
+	    } else {
+		.top.target.m.clist add command -label $n -command \
+		    [list reopen-target $n {}]
+	    }
+	}
     }
     .top.target.m.slist delete 0 last
-    foreach n [lsort [array names profile]] {
+    foreach nn [lsort [array names profile *,host]] {
+	set ll [expr [string length $nn] - 6]
+	set n [string range $nn 0 $ll]
+	
         .top.target.m.slist add command -label $n \
                 -command [list protocol-setup $n]
     }
@@ -2865,20 +2880,19 @@ proc save-geometry {} {
         return
     } 
     if {$hostid != "Default"} {
-        puts $f "set hostid \{$hostid\}"
+        puts $f "set hostid [list $hostid]"
         set b [z39 databaseNames]
-        puts $f "set hostbase $b"
+        puts $f "set hostbase [list $b]"
     }
-    puts $f "set hotTargets \{ $hotTargets \}"
+    puts $f "set hotTargets [list $hotTargets]"
     puts $f "set textWrap $textWrap"
     puts $f "set displayFormat $displayFormat"
     puts $f "set popupMarcdf $popupMarcdf"
     puts $f "set recordSyntax $recordSyntax"
     puts $f "set elementSetNames $elementSetNames"
     foreach n [array names windowGeometry] {
-        puts -nonewline $f "set \{windowGeometry($n)\} \{"
-        puts -nonewline $f $windowGeometry($n)
-        puts $f "\}"
+        puts -nonewline $f "set [list windowGeometry($n)] "
+        puts $f [list $windowGeometry($n)]
     }
     close $f
 }
@@ -2909,24 +2923,14 @@ proc save-settings {} {
     }
     puts $f "# Setup file"
 
-    foreach n [array names profile] {
-
-        puts -nonewline $f "set \{profile($n)\} \{"
-        puts -nonewline $f $profile($n)
-        puts $f "\}"
-        puts $f {}
+    foreach n [lsort [array names profile]] {
+        puts $f "set [list profile($n)] [list $profile($n)]"
     }
-    puts -nonewline $f "set queryTypes \{" 
-    puts -nonewline $f $queryTypes
-    puts $f "\}"
+    puts $f "set queryTypes [list $queryTypes]"
     
-    puts -nonewline $f "set queryButtons \{" 
-    puts -nonewline $f $queryButtons
-    puts $f "\}"
+    puts $f "set queryButtons [list $queryButtons]"
     
-    puts -nonewline $f "set queryInfo \{"
-    puts -nonewline $f $queryInfo
-    puts $f "\}"
+    puts $f "set queryInfo [list $queryInfo]"
     close $f
     set settingsChanged 0
 }
@@ -3006,7 +3010,7 @@ proc listbuttonx {button no names handle user} {
     } else {
         menubutton $button -text [lindex [lindex $names $no] 0] \
                 -width 10 -menu ${button}.m -relief raised -border 1
-        menu ${button}.m
+        irmenu ${button}.m
         if {[tk4]} {
             ${button}.m configure -tearoff off
 	}
@@ -3029,7 +3033,7 @@ proc listbuttonx {button no names handle user} {
 proc listbutton {button no names} {
     menubutton $button -text [lindex $names $no] -width 10 -menu ${button}.m \
             -relief raised -border 1
-    menu ${button}.m
+    irmenu ${button}.m
     if {[tk4]} {
         ${button}.m configure -tearoff off
     }
@@ -3078,7 +3082,7 @@ proc listbuttonv {button var names} {
     }
     menubutton $button -text $n -menu ${button}.m \
             -relief raised -border 1
-    menu ${button}.m
+    irmenu ${button}.m
     if {[tk4]} {
         ${button}.m configure -tearoff off
     }
@@ -3809,8 +3813,10 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
             if {! [winfo exists $w.$i.e]} {
                 entry $w.$i.e -width 32 -relief sunken -border 1
                 bind $w.$i.e <FocusIn> [list index-focus-in $w $i]
-                bind $w.$i.e <FocusOut> [list $w.$i configure \
-                        -background white]
+				if {![tk4]} {
+                    bind $w.$i.e <FocusOut> [list $w.$i configure \
+                          -background white]
+				}
                 pack $w.$i.l -side left
                 pack $w.$i.e -side left -fill x -expand yes
                 pack $w.$i -side top -fill x -padx 2 -pady 2
@@ -3914,14 +3920,14 @@ pack .bot -fill x
 
 # Init: Definition of File menu.
 menubutton .top.file -text File -menu .top.file.m
-menu .top.file.m
+irmenu .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}
 
 # Init: Definition of Target menu.
 menubutton .top.target -text Target -menu .top.target.m
-menu .top.target.m
+irmenu .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 About -command {about-target}
@@ -3933,35 +3939,37 @@ set-target-hotlist 0
 configure-disable-e .top.target.m 1
 configure-disable-e .top.target.m 2
 
-menu .top.target.m.clist
-menu .top.target.m.slist
+irmenu .top.target.m.clist
+irmenu .top.target.m.slist
 cascade-target-list
 
 # Init: Definition of Service menu.
 menubutton .top.service -text Service -menu .top.service.m
-menu .top.service.m
+irmenu .top.service.m
 .top.service.m add cascade -label Database -menu .top.service.m.dblist
 .top.service.m add cascade -label Present -menu .top.service.m.present
-menu .top.service.m.present
+irmenu .top.service.m.present
 .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 0}
 .top.service.m add command -label Scan -command {scan-request}
+.top.service.m add command -label Explain -command \
+    {explain-refresh $hostid {ready-response {}} }
 
 .top.service configure -state disabled
 
-menu .top.service.m.dblist
+irmenu .top.service.m.dblist
 
 menubutton .top.rset -text Set -menu .top.rset.m
-menu .top.rset.m
+irmenu .top.rset.m
 .top.rset.m add command -label Load -command {load-set}
 .top.rset.m add separator
 
 # Init: Definition of the Options menu.
 menubutton .top.options -text Options -menu .top.options.m
-menu .top.options.m
+irmenu .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
@@ -3970,7 +3978,7 @@ menu .top.options.m
 .top.options.m add radiobutton -label Debug -variable debugMode -value 1
 
 # Init: Definition of the Options|Query menu.
-menu .top.options.m.query
+irmenu .top.options.m.query
 .top.options.m.query add cascade -label Select \
         -menu .top.options.m.query.clist
 .top.options.m.query add cascade -label Edit \
@@ -3980,13 +3988,13 @@ menu .top.options.m.query
 .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
+irmenu .top.options.m.query.slist
+irmenu .top.options.m.query.clist
+irmenu .top.options.m.query.dlist
 cascade-query-list
 
 # Init: Definition of the Options|Formats menu.
-menu .top.options.m.formats
+irmenu .top.options.m.formats
 set i 0
 foreach f $displayFormats {
     .top.options.m.formats add radiobutton -label $f -value $i \
@@ -3995,7 +4003,7 @@ foreach f $displayFormats {
 }
 
 # Init: Definition of the Options|Wrap menu.
-menu .top.options.m.wrap
+irmenu .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 \
@@ -4004,7 +4012,7 @@ menu .top.options.m.wrap
         -value none -variable textWrap -command {set-wrap none}
 
 # Init: Definition of the Options|Syntax menu.
-menu .top.options.m.syntax
+irmenu .top.options.m.syntax
 .top.options.m.syntax add radiobutton -label None \
         -value None -variable recordSyntax
 .top.options.m.syntax add separator
@@ -4030,7 +4038,7 @@ menu .top.options.m.syntax
         -value GRS1 -variable recordSyntax
 
 # Init: Definition of the Options|Elements menu.
-menu .top.options.m.elements
+irmenu .top.options.m.elements
 .top.options.m.elements add radiobutton -label Unspecified \
         -value None -variable elementSetNames
 .top.options.m.elements add radiobutton -label Full \
@@ -4040,7 +4048,7 @@ menu .top.options.m.elements
 
 # Init: Definition of Help menu.
 menubutton .top.help -text "Help" -menu .top.help.m
-menu .top.help.m
+irmenu .top.help.m
 
 .top.help.m add command -label "Help on help" \
         -command {tkerror "Help on help not available. Sorry"}
@@ -4066,7 +4074,8 @@ pack .mid.search .mid.scan .mid.present .mid.clear -side left \
 
 # Init: Define record area in main window.
 text .data.record -font fixed -height 2 -width 20 -wrap none -borderwidth 0 \
-        -relief flat -yscrollcommand [list .data.scroll set] -wrap $textWrap
+        -relief flat -yscrollcommand [list .data.scroll set] \
+        -wrap $textWrap -background grey85
 scrollbar .data.scroll -command [list .data.record yview]
 if {[tk4]} {
     .data.record configure -takefocus 0
@@ -4107,7 +4116,7 @@ frame .bot.a
 pack .bot.a -side left -fill x
 pack .bot.logo -side right -padx 2 -pady 2 -ipadx 1
 
-message .bot.a.target -text "" -aspect 1000 -border 1
+message .bot.a.target -text {} -aspect 2000 -border 1
 
 label .bot.a.status -text "Not connected" -width 15 -relief \
         sunken -anchor w -border 1
@@ -4125,7 +4134,7 @@ pack .bot.a.status .bot.a.set .bot.a.message \
 if {[catch {ir z39}]} {
     set e [info sharedlibextension]
     puts -nonewline "Loading irtcl$e ..."
-    load irtcl$e irtcl
+    load ${libdir}/irtcl$e irtcl
     ir z39
     puts "ok"
 }
@@ -4134,9 +4143,9 @@ if {[file exists ${libdir}/explain.tcl]} {
     source ${libdir}/explain.tcl
 }
 
-#if {[file exists ${libdir}/setup.tcl]} {
-#    source ${libdir}/setup.tcl
-#}
+if {[file exists ${libdir}/setup.tcl]} {
+    source ${libdir}/setup.tcl
+}
 
 # Init: Uncomment this line if you wan't to enable logging.
 ir-log-init all
diff --git a/clientrc.tcl b/clientrc.tcl
index 4732a29..c8968d8 100644
--- a/clientrc.tcl
+++ b/clientrc.tcl
@@ -1,39 +1,595 @@
 # Setup file
-set {profile(io)} {IO io.dtv.dk 9999 {} 50000 30000 tcpip Default 1 {} {} Z39 34 2 0 0 4 851083005 {} {} {} {} {} {} {} {} {} {} {}}
+set profile(AGRICOLA,authentication) {}
+set profile(AGRICOLA,comstack) tcpip
+set profile(AGRICOLA,databases) AGRICOLA
+set profile(AGRICOLA,description) AGRICOLA
+set profile(AGRICOLA,host) Tikal.dev.oclc.org
+set profile(AGRICOLA,largeSetLowerBound) 2
+set profile(AGRICOLA,maxResultSets) {}
+set profile(AGRICOLA,maxResultSize) {}
+set profile(AGRICOLA,maxTerms) {}
+set profile(AGRICOLA,maximumRecordSize) 50000
+set profile(AGRICOLA,mediumSetPresentNumber) 0
+set profile(AGRICOLA,multipleDatabases) 0
+set profile(AGRICOLA,namedResultSets) 1
+set profile(AGRICOLA,port) 210
+set profile(AGRICOLA,preferredMessageSize) 30000
+set profile(AGRICOLA,presentChunk) 4
+set profile(AGRICOLA,protocol) Z39
+set profile(AGRICOLA,queryCCL) 0
+set profile(AGRICOLA,queryRPN) 1
+set profile(AGRICOLA,recentNews) {}
+set profile(AGRICOLA,smallSetUpperBound) 0
+set profile(AGRICOLA,targetInfoName) {}
+set profile(AGRICOLA,timeDefine) 878567355
+set profile(AGRICOLA,timeLastExplain) {}
+set profile(AGRICOLA,timeLastInit) 879938261
+set profile(AGRICOLA,welcomeMessage) {}
+set profile(AGRICOLA,windowNumber) 2
+set profile(AULS,authentication) {}
+set profile(AULS,comstack) tcpip
+set profile(AULS,databases) {AULS mad}
+set profile(AULS,description) {Acadia university
+}
+set profile(AULS,host) auls.acadiau.ca
+set profile(AULS,largeSetLowerBound) 2
+set profile(AULS,maxResultSets) {}
+set profile(AULS,maxResultSize) {}
+set profile(AULS,maxTerms) {}
+set profile(AULS,maximumRecordSize) 16384
+set profile(AULS,mediumSetPresentNumber) 0
+set profile(AULS,multipleDatabases) 0
+set profile(AULS,namedResultSets) 1
+set profile(AULS,port) 210
+set profile(AULS,preferredMessageSize) 8192
+set profile(AULS,presentChunk) 4
+set profile(AULS,protocol) Z39
+set profile(AULS,queryCCL) 0
+set profile(AULS,queryRPN) 1
+set profile(AULS,recentNews) {}
+set profile(AULS,smallSetUpperBound) 0
+set profile(AULS,targetInfoName) {}
+set profile(AULS,timeDefine) 878567355
+set profile(AULS,timeLastExplain) {}
+set profile(AULS,timeLastInit) {}
+set profile(AULS,welcomeMessage) {}
+set profile(AULS,windowNumber) 14
+set profile(BIBSYS,authentication) {}
+set profile(BIBSYS,comstack) tcpip
+set profile(BIBSYS,databases) {BIBSYS PERI}
+set profile(BIBSYS,description) BIBSYS
+set profile(BIBSYS,host) z3950.bibsys.no
+set profile(BIBSYS,largeSetLowerBound) 2
+set profile(BIBSYS,maxResultSets) {}
+set profile(BIBSYS,maxResultSize) {}
+set profile(BIBSYS,maxTerms) {}
+set profile(BIBSYS,maximumRecordSize) 50000
+set profile(BIBSYS,mediumSetPresentNumber) 0
+set profile(BIBSYS,multipleDatabases) 0
+set profile(BIBSYS,namedResultSets) 1
+set profile(BIBSYS,port) 2100
+set profile(BIBSYS,preferredMessageSize) 30000
+set profile(BIBSYS,presentChunk) 4
+set profile(BIBSYS,protocol) Z39
+set profile(BIBSYS,queryCCL) 0
+set profile(BIBSYS,queryRPN) 1
+set profile(BIBSYS,recentNews) {}
+set profile(BIBSYS,smallSetUpperBound) 0
+set profile(BIBSYS,targetInfoName) {}
+set profile(BIBSYS,timeDefine) 878567355
+set profile(BIBSYS,timeLastExplain) {}
+set profile(BIBSYS,timeLastInit) 878569986
+set profile(BIBSYS,welcomeMessage) {}
+set profile(BIBSYS,windowNumber) 6
+set {profile(Bell Laboratories Library Network,authentication)} {}
+set {profile(Bell Laboratories Library Network,comstack)} tcpip
+set {profile(Bell Laboratories Library Network,databases)} {ir-explain-1 books gils netlib ls-lr z39dbs acc1 acc2 acc3 factbook books}
+set {profile(Bell Laboratories Library Network,description)} {Bell Laboratories Library Network}
+set {profile(Bell Laboratories Library Network,host)} z3950.bell-labs.com
+set {profile(Bell Laboratories Library Network,largeSetLowerBound)} 2
+set {profile(Bell Laboratories Library Network,maxResultSets)} 100
+set {profile(Bell Laboratories Library Network,maxResultSize)} 600000
+set {profile(Bell Laboratories Library Network,maxTerms)} {}
+set {profile(Bell Laboratories Library Network,maximumRecordSize)} 50000
+set {profile(Bell Laboratories Library Network,mediumSetPresentNumber)} 0
+set {profile(Bell Laboratories Library Network,multipleDatabases)} 0
+set {profile(Bell Laboratories Library Network,namedResultSets)} 1
+set {profile(Bell Laboratories Library Network,port)} 210
+set {profile(Bell Laboratories Library Network,preferredMessageSize)} 30000
+set {profile(Bell Laboratories Library Network,presentChunk)} 4
+set {profile(Bell Laboratories Library Network,protocol)} Z39
+set {profile(Bell Laboratories Library Network,queryCCL)} 0
+set {profile(Bell Laboratories Library Network,queryRPN)} 1
+set {profile(Bell Laboratories Library Network,recentNews)} {}
+set {profile(Bell Laboratories Library Network,smallSetUpperBound)} 0
+set {profile(Bell Laboratories Library Network,targetInfoName)} {Lucent Technologies Research Server}
+set {profile(Bell Laboratories Library Network,timeDefine)} 878567355
+set {profile(Bell Laboratories Library Network,timeLastExplain)} 879263917
+set {profile(Bell Laboratories Library Network,timeLastInit)} 879263917
+set {profile(Bell Laboratories Library Network,welcomeMessage)} {Salutations - this is Lucent Technologies experimental Z39.50 server. No guarentees, but free and unlimited access!}
+set {profile(Bell Laboratories Library Network,windowNumber)} 13
+set {profile(Bibliothèque Nationale du Québec,authentication)} {}
+set {profile(Bibliothèque Nationale du Québec,comstack)} tcpip
+set {profile(Bibliothèque Nationale du Québec,databases)} IRIS
+set {profile(Bibliothèque Nationale du Québec,description)} {Bibliothèque Nationale du Québec}
+set {profile(Bibliothèque Nationale du Québec,host)} www.biblinat.gouv.qc.ca
+set {profile(Bibliothèque Nationale du Québec,largeSetLowerBound)} 2
+set {profile(Bibliothèque Nationale du Québec,maxResultSets)} {}
+set {profile(Bibliothèque Nationale du Québec,maxResultSize)} {}
+set {profile(Bibliothèque Nationale du Québec,maxTerms)} {}
+set {profile(Bibliothèque Nationale du Québec,maximumRecordSize)} 50000
+set {profile(Bibliothèque Nationale du Québec,mediumSetPresentNumber)} 0
+set {profile(Bibliothèque Nationale du Québec,multipleDatabases)} 0
+set {profile(Bibliothèque Nationale du Québec,namedResultSets)} 1
+set {profile(Bibliothèque Nationale du Québec,port)} 210
+set {profile(Bibliothèque Nationale du Québec,preferredMessageSize)} 30000
+set {profile(Bibliothèque Nationale du Québec,presentChunk)} 4
+set {profile(Bibliothèque Nationale du Québec,protocol)} Z39
+set {profile(Bibliothèque Nationale du Québec,queryCCL)} 0
+set {profile(Bibliothèque Nationale du Québec,queryRPN)} 1
+set {profile(Bibliothèque Nationale du Québec,recentNews)} {}
+set {profile(Bibliothèque Nationale du Québec,smallSetUpperBound)} 0
+set {profile(Bibliothèque Nationale du Québec,targetInfoName)} {}
+set {profile(Bibliothèque Nationale du Québec,timeDefine)} 878567355
+set {profile(Bibliothèque Nationale du Québec,timeLastExplain)} {}
+set {profile(Bibliothèque Nationale du Québec,timeLastInit)} 878569953
+set {profile(Bibliothèque Nationale du Québec,welcomeMessage)} {}
+set {profile(Bibliothèque Nationale du Québec,windowNumber)} 11
+set profile(DanBib,authentication) {}
+set profile(DanBib,comstack) tcpip
+set profile(DanBib,databases) {danbib DANBIBV2}
+set profile(DanBib,description) {Danish Union Catalogue}
+set profile(DanBib,host) ir.dbc.bib.dk
+set profile(DanBib,largeSetLowerBound) 2
+set profile(DanBib,maxResultSets) {}
+set profile(DanBib,maxResultSize) {}
+set profile(DanBib,maxTerms) {}
+set profile(DanBib,maximumRecordSize) 50000
+set profile(DanBib,mediumSetPresentNumber) 0
+set profile(DanBib,multipleDatabases) 0
+set profile(DanBib,namedResultSets) 1
+set profile(DanBib,port) 1804
+set profile(DanBib,preferredMessageSize) 30000
+set profile(DanBib,presentChunk) 4
+set profile(DanBib,protocol) Z39
+set profile(DanBib,queryCCL) 0
+set profile(DanBib,queryRPN) 1
+set profile(DanBib,recentNews) {}
+set profile(DanBib,smallSetUpperBound) 0
+set profile(DanBib,targetInfoName) {}
+set profile(DanBib,timeDefine) 878567355
+set profile(DanBib,timeLastExplain) {}
+set profile(DanBib,timeLastInit) {}
+set profile(DanBib,welcomeMessage) {}
+set profile(DanBib,windowNumber) 10
+set profile(Default,authentication) {}
+set profile(Default,comstack) tcpip
+set profile(Default,description) {}
+set profile(Default,host) {}
+set profile(Default,largeSetLowerBound) 2
+set profile(Default,maxResultSets) {}
+set profile(Default,maxResultSize) {}
+set profile(Default,maxTerms) {}
+set profile(Default,maximumRecordSize) 50000
+set profile(Default,mediumSetPresentNumber) 0
+set profile(Default,multipleDatabases) 0
+set profile(Default,namedResultSets) 1
+set profile(Default,port) 210
+set profile(Default,preferredMessageSize) 30000
+set profile(Default,presentChunk) 4
+set profile(Default,protocol) Z39
+set profile(Default,queryCCL) 0
+set profile(Default,queryRPN) 1
+set profile(Default,recentNews) {}
+set profile(Default,smallSetUpperBound) 0
+set profile(Default,targetInfoName) {}
+set profile(Default,timeDefine) {}
+set profile(Default,timeLastExplain) {}
+set profile(Default,timeLastInit) {}
+set profile(Default,welcomeMessage) {}
+set profile(Default,windowNumber) 20
+set profile(LOC,authentication) {}
+set profile(LOC,comstack) tcpip
+set profile(LOC,databases) {BOOKS NAMES AUTH MAPS MUSIC BIB SERIALS SUBJECTS}
+set profile(LOC,description) {Library of Congress}
+set profile(LOC,host) IBM2.LOC.gov
+set profile(LOC,largeSetLowerBound) 2
+set profile(LOC,maxResultSets) {}
+set profile(LOC,maxResultSize) {}
+set profile(LOC,maxTerms) {}
+set profile(LOC,maximumRecordSize) 16384
+set profile(LOC,mediumSetPresentNumber) 0
+set profile(LOC,multipleDatabases) 0
+set profile(LOC,namedResultSets) 1
+set profile(LOC,port) 2210
+set profile(LOC,preferredMessageSize) 16384
+set profile(LOC,presentChunk) 4
+set profile(LOC,protocol) Z39
+set profile(LOC,queryCCL) 0
+set profile(LOC,queryRPN) 1
+set profile(LOC,recentNews) {}
+set profile(LOC,smallSetUpperBound) 0
+set profile(LOC,targetInfoName) {}
+set profile(LOC,timeDefine) 878567355
+set profile(LOC,timeLastExplain) {}
+set profile(LOC,timeLastInit) {}
+set profile(LOC,welcomeMessage) {}
+set profile(LOC,windowNumber) 8
+set profile(Penn,authentication) {}
+set profile(Penn,comstack) tcpip
+set profile(Penn,databases) CATALOG
+set profile(Penn,description) {Penn State's Library}
+set profile(Penn,host) 128.118.88.200
+set profile(Penn,largeSetLowerBound) 2
+set profile(Penn,maxResultSets) {}
+set profile(Penn,maxResultSize) {}
+set profile(Penn,maxTerms) {}
+set profile(Penn,maximumRecordSize) 16384
+set profile(Penn,mediumSetPresentNumber) 0
+set profile(Penn,multipleDatabases) 0
+set profile(Penn,namedResultSets) 1
+set profile(Penn,port) 210
+set profile(Penn,preferredMessageSize) 8192
+set profile(Penn,presentChunk) 4
+set profile(Penn,protocol) Z39
+set profile(Penn,queryCCL) 0
+set profile(Penn,queryRPN) 1
+set profile(Penn,recentNews) {}
+set profile(Penn,smallSetUpperBound) 0
+set profile(Penn,targetInfoName) {}
+set profile(Penn,timeDefine) 878567355
+set profile(Penn,timeLastExplain) {}
+set profile(Penn,timeLastInit) {}
+set profile(Penn,welcomeMessage) {}
+set profile(Penn,windowNumber) 1
+set profile(aleph500,authentication) {}
+set profile(aleph500,comstack) tcpip
+set profile(aleph500,databases) bib01
+set profile(aleph500,description) {
+}
+set profile(aleph500,host) uranus.dtv.dk
+set profile(aleph500,largeSetLowerBound) 2
+set profile(aleph500,maxResultSets) {}
+set profile(aleph500,maxResultSize) {}
+set profile(aleph500,maxTerms) {}
+set profile(aleph500,maximumRecordSize) 50000
+set profile(aleph500,mediumSetPresentNumber) 0
+set profile(aleph500,multipleDatabases) 0
+set profile(aleph500,namedResultSets) 1
+set profile(aleph500,port) 9999
+set profile(aleph500,preferredMessageSize) 30000
+set profile(aleph500,presentChunk) 4
+set profile(aleph500,protocol) Z39
+set profile(aleph500,queryCCL) 0
+set profile(aleph500,queryRPN) 1
+set profile(aleph500,recentNews) {}
+set profile(aleph500,smallSetUpperBound) 0
+set profile(aleph500,targetInfoName) {}
+set profile(aleph500,timeDefine) 878567355
+set profile(aleph500,timeLastExplain) {}
+set profile(aleph500,timeLastInit) 879262883
+set profile(aleph500,welcomeMessage) {}
+set profile(aleph500,windowNumber) 16
+set profile(arcatarget,authentication) {}
+set profile(arcatarget,comstack) tcpip
+set profile(arcatarget,databases) {IEI-books IR-Explain-1}
+set profile(arcatarget,description) {ARCA Target
 
-set {profile(Penn)} {{Penn State's Library} 128.118.88.200 210 {} 16384 8192 tcpip CATALOG 1 {} {} Z39 2 {} {} {} {} {} 847978115 {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(DanBib, SR)} {{SR Target DANBIB} 0103/find2.denet.dk 4500 {} 8192 8192 mosi danbib 1 {} 1 SR 8 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(AGRICOLA)} {AGRICOLA Tikal.dev.oclc.org 210 {} 50000 30000 tcpip AGRICOLA 1 {} {} Z39 31 2 0 0 4 {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(madison)} {{University of Wisconsin-Madison} z3950.adp.wisc.edu 210 {} 16384 8192 tcpip madison 1 {} {} Z39 22 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(bibsys)} {{BIBSYS Target (YAZ-based)} z3950.bibsys.no 2100 {} 16384 8192 tcpip BIBSYS 1 {} 1 Z39 27 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(Default)} {{} {} {210} {} 50000 30000 tcpip {} 1 {} {} Z39 35 2 0 0 4 {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(RLG)} {{Research Libraries group} rlg.stanford.edu 210 {} 32768 32768 tcpip {DEM} 1 {} 1 Z39 5 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(ztest9999)} {{YAZ server on localhost} localhost 9999 {} 50000 30000 tcpip Default {} {} {} Z39 33 2 0 0 4 842607655 858590340 842611107 {} {} {} {} {} {} {} {} {}}
 
-set {profile(AT&T server)} {{AT&T Z39 Server} z3950.research.att.com 210 {} 90000 90000 tcpip {explain books gils netlib ftp z39dbs ahd books books books factbook russian outside-marc} 1 {} {} Z39 21 {} {} {} {} {} 842605350 842605239 {Lucent Technologies Research Server} {} 100 600000 {} {} 0 {Salutations - this is Lucent Technologies experimental Z39.50 server. No guarentees, but free and unlimited access!} {}}
 
-set {profile(LOC)} {{Library of Congress} IBM2.LOC.gov 2210 {} 16384 16384 tcpip {BOOKS NAMES} 1 {} 0 Z39 6 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(DanBib)} {{Danish Union Catalogue} ir.dbc.bib.dk 2008 {} 50000 30000 tcpip danbib 1 {} {} Z39 32 2 0 0 4 {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(CARL)} {{CARL systems} z3950.marmot.org 210 {} 32768 32768 tcpip {ADA ASP CMC CNW DUR EAG LEW MST MPL MPS MON PTH PTK SWL VAI PVS COR SUM THR GAR SMG BUD CRM DEL GUN} 1 {} {} Z39 11 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(CLSI)} {CLSI inet-gw.clsi.us.geac.com 210 {} 16384 8192 tcpip cl_default 1 {} {} Z39 13 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
-set {profile(AULS)} {{Acadia university
-} auls.acadiau.ca 210 {} 16384 8192 tcpip {AULS mad} 1 {} {} Z39 14 {} {} {} {} {} {} {} {
-} {
-} {} {} {} {} {} {} {}}
 
-set {profile(dranet)} {dranet dranet.dra.com 210 {} 16384 16384 tcpip drewdb 1 {} 1 Z39 15 {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
 
+
+
+}
+set profile(arcatarget,host) arca.iei.pi.cnr.it
+set profile(arcatarget,largeSetLowerBound) 2
+set profile(arcatarget,maxResultSets) {}
+set profile(arcatarget,maxResultSize) {}
+set profile(arcatarget,maxTerms) {}
+set profile(arcatarget,maximumRecordSize) 50000
+set profile(arcatarget,mediumSetPresentNumber) 0
+set profile(arcatarget,multipleDatabases) 0
+set profile(arcatarget,namedResultSets) 1
+set profile(arcatarget,port) 2000
+set profile(arcatarget,preferredMessageSize) 30000
+set profile(arcatarget,presentChunk) 4
+set profile(arcatarget,protocol) Z39
+set profile(arcatarget,queryCCL) 0
+set profile(arcatarget,queryRPN) 1
+set profile(arcatarget,recentNews) {}
+set profile(arcatarget,smallSetUpperBound) 0
+set profile(arcatarget,targetInfoName) {}
+set profile(arcatarget,timeDefine) 878567355
+set profile(arcatarget,timeLastExplain) {}
+set profile(arcatarget,timeLastInit) {}
+set profile(arcatarget,welcomeMessage) {}
+set profile(arcatarget,windowNumber) 9
+set profile(author,authentication) {}
+set profile(author,comstack) tcpip
+set profile(author,databases) {spain portugal france england belgium}
+set profile(author,description) {}
+set profile(author,host) mars.dtv.dk
+set profile(author,largeSetLowerBound) 2
+set profile(author,maxResultSets) {}
+set profile(author,maxResultSize) {}
+set profile(author,maxTerms) {}
+set profile(author,maximumRecordSize) 50000
+set profile(author,mediumSetPresentNumber) 0
+set profile(author,multipleDatabases) 0
+set profile(author,namedResultSets) 1
+set profile(author,port) 8889
+set profile(author,preferredMessageSize) 30000
+set profile(author,presentChunk) 4
+set profile(author,protocol) Z39
+set profile(author,queryCCL) 0
+set profile(author,queryRPN) 1
+set profile(author,recentNews) {}
+set profile(author,smallSetUpperBound) 0
+set profile(author,targetInfoName) {}
+set profile(author,timeDefine) 878567355
+set profile(author,timeLastExplain) {}
+set profile(author,timeLastInit) 879777702
+set profile(author,welcomeMessage) {}
+set profile(author,windowNumber) 4
+set profile(bacon,authentication) {}
+set profile(bacon,comstack) tcpip
+set profile(bacon,databases) Default
+set profile(bacon,description) {}
+set profile(bacon,host) bacon.indexdata.dk
+set profile(bacon,largeSetLowerBound) 2
+set profile(bacon,maxResultSets) {}
+set profile(bacon,maxResultSize) {}
+set profile(bacon,maxTerms) {}
+set profile(bacon,maximumRecordSize) 50000
+set profile(bacon,mediumSetPresentNumber) 0
+set profile(bacon,multipleDatabases) 0
+set profile(bacon,namedResultSets) 1
+set profile(bacon,port) 9999
+set profile(bacon,preferredMessageSize) 30000
+set profile(bacon,presentChunk) 4
+set profile(bacon,protocol) Z39
+set profile(bacon,queryCCL) 0
+set profile(bacon,queryRPN) 1
+set profile(bacon,recentNews) {}
+set profile(bacon,smallSetUpperBound) 0
+set profile(bacon,targetInfoName) {}
+set profile(bacon,timeDefine) 878567355
+set profile(bacon,timeLastExplain) {}
+set profile(bacon,timeLastInit) {}
+set profile(bacon,welcomeMessage) {}
+set profile(bacon,windowNumber) 5
+set profile(burns,authentication) {}
+set profile(burns,comstack) tcpip
+set profile(burns,databases) Default
+set profile(burns,description) {
+
+
+
+}
+set profile(burns,host) burns.fdgroup.co.uk
+set profile(burns,idAuthentication) {}
+set profile(burns,largeSetLowerBound) 2
+set profile(burns,maxResultSets) {}
+set profile(burns,maxResultSize) {}
+set profile(burns,maxTerms) {}
+set profile(burns,maximumRecordSize) 50000
+set profile(burns,mediumSetPresentNumber) 0
+set profile(burns,multipleDatabases) 0
+set profile(burns,namedResultSets) 1
+set profile(burns,port) 9999
+set profile(burns,preferredMessageSize) 30000
+set profile(burns,presentChunk) 4
+set profile(burns,protocol) Z39
+set profile(burns,queryCCL) 0
+set profile(burns,queryRPN) 1
+set profile(burns,recentNews) {
+
+
+
+}
+set profile(burns,smallSetUpperBound) 0
+set profile(burns,targetInfoName) {
+
+
+
+}
+set profile(burns,targetMaxResultSets) {}
+set profile(burns,targetMaxResultSize) {}
+set profile(burns,targetMaxTerms) {}
+set profile(burns,timeDefine) {}
+set profile(burns,timeLastExplain) {}
+set profile(burns,timeLastInit) 879415443
+set profile(burns,welcomeMessage) {
+
+
+
+}
+set profile(burns,windowNumber) 18
+set profile(dranet,authentication) {}
+set profile(dranet,comstack) tcpip
+set profile(dranet,databases) drewdb
+set profile(dranet,description) dranet
+set profile(dranet,host) dranet.dra.com
+set profile(dranet,largeSetLowerBound) 2
+set profile(dranet,maxResultSets) {}
+set profile(dranet,maxResultSize) {}
+set profile(dranet,maxTerms) {}
+set profile(dranet,maximumRecordSize) 563840
+set profile(dranet,mediumSetPresentNumber) 0
+set profile(dranet,multipleDatabases) 0
+set profile(dranet,namedResultSets) 1
+set profile(dranet,port) 210
+set profile(dranet,preferredMessageSize) 563840
+set profile(dranet,presentChunk) 4
+set profile(dranet,protocol) Z39
+set profile(dranet,queryCCL) 0
+set profile(dranet,queryRPN) 1
+set profile(dranet,recentNews) {}
+set profile(dranet,smallSetUpperBound) 0
+set profile(dranet,targetInfoName) {}
+set profile(dranet,timeDefine) 878567355
+set profile(dranet,timeLastExplain) {}
+set profile(dranet,timeLastInit) {}
+set profile(dranet,welcomeMessage) {}
+set profile(dranet,windowNumber) 15
+set profile(gilstest,authentication) {}
+set profile(gilstest,comstack) tcpip
+set profile(gilstest,databases) Default
+set profile(gilstest,description) {
+}
+set profile(gilstest,host) localhost
+set profile(gilstest,idAuthentication) {}
+set profile(gilstest,largeSetLowerBound) 2
+set profile(gilstest,maxResultSets) {}
+set profile(gilstest,maxResultSize) {}
+set profile(gilstest,maxTerms) {}
+set profile(gilstest,maximumRecordSize) 50000
+set profile(gilstest,mediumSetPresentNumber) 0
+set profile(gilstest,multipleDatabases) 0
+set profile(gilstest,namedResultSets) 1
+set profile(gilstest,port) 9999
+set profile(gilstest,preferredMessageSize) 30000
+set profile(gilstest,presentChunk) 4
+set profile(gilstest,protocol) Z39
+set profile(gilstest,queryCCL) 0
+set profile(gilstest,queryRPN) 1
+set profile(gilstest,recentNews) {
+}
+set profile(gilstest,smallSetUpperBound) 0
+set profile(gilstest,targetInfoName) {
+}
+set profile(gilstest,targetMaxResultSets) {}
+set profile(gilstest,targetMaxResultSize) {}
+set profile(gilstest,targetMaxTerms) {}
+set profile(gilstest,timeDefine) {}
+set profile(gilstest,timeLastExplain) {}
+set profile(gilstest,timeLastInit) 879779577
+set profile(gilstest,welcomeMessage) {
+}
+set profile(gilstest,windowNumber) 19
+set profile(libris,authentication) {}
+set profile(libris,comstack) tcpip
+set profile(libris,databases) libr
+set profile(libris,description) LIBRIS
+set profile(libris,host) z3950.libris.kb.se
+set profile(libris,largeSetLowerBound) 2
+set profile(libris,maxResultSets) {}
+set profile(libris,maxResultSize) {}
+set profile(libris,maxTerms) {}
+set profile(libris,maximumRecordSize) 50000
+set profile(libris,mediumSetPresentNumber) 0
+set profile(libris,multipleDatabases) 0
+set profile(libris,namedResultSets) 1
+set profile(libris,port) 210
+set profile(libris,preferredMessageSize) 30000
+set profile(libris,presentChunk) 4
+set profile(libris,protocol) Z39
+set profile(libris,queryCCL) 0
+set profile(libris,queryRPN) 1
+set profile(libris,recentNews) {}
+set profile(libris,smallSetUpperBound) 0
+set profile(libris,targetInfoName) {}
+set profile(libris,timeDefine) 878567355
+set profile(libris,timeLastExplain) {}
+set profile(libris,timeLastInit) {}
+set profile(libris,welcomeMessage) {}
+set profile(libris,windowNumber) 12
+set profile(madison,authentication) {}
+set profile(madison,comstack) tcpip
+set profile(madison,databases) madison
+set profile(madison,description) {University of Wisconsin-Madison}
+set profile(madison,host) z3950.adp.wisc.edu
+set profile(madison,largeSetLowerBound) 2
+set profile(madison,maxResultSets) {}
+set profile(madison,maxResultSize) {}
+set profile(madison,maxTerms) {}
+set profile(madison,maximumRecordSize) 16384
+set profile(madison,mediumSetPresentNumber) 0
+set profile(madison,multipleDatabases) 0
+set profile(madison,namedResultSets) 1
+set profile(madison,port) 210
+set profile(madison,preferredMessageSize) 8192
+set profile(madison,presentChunk) 4
+set profile(madison,protocol) Z39
+set profile(madison,queryCCL) 0
+set profile(madison,queryRPN) 1
+set profile(madison,recentNews) {}
+set profile(madison,smallSetUpperBound) 0
+set profile(madison,targetInfoName) {}
+set profile(madison,timeDefine) 878567355
+set profile(madison,timeLastExplain) {}
+set profile(madison,timeLastInit) {}
+set profile(madison,welcomeMessage) {}
+set profile(madison,windowNumber) 3
+set profile(x,authentication) {}
+set profile(x,comstack) tcpip
+set profile(x,description) {
+}
+set profile(x,host) {}
+set profile(x,largeSetLowerBound) 2
+set profile(x,maxResultSets) {}
+set profile(x,maxResultSize) {}
+set profile(x,maxTerms) {}
+set profile(x,maximumRecordSize) 50000
+set profile(x,mediumSetPresentNumber) 0
+set profile(x,multipleDatabases) 0
+set profile(x,namedResultSets) 1
+set profile(x,port) 210
+set profile(x,preferredMessageSize) 30000
+set profile(x,presentChunk) 4
+set profile(x,protocol) Z39
+set profile(x,queryCCL) 0
+set profile(x,queryRPN) 1
+set profile(x,recentNews) {
+}
+set profile(x,smallSetUpperBound) 0
+set profile(x,targetInfoName) {
+}
+set profile(x,timeDefine) {}
+set profile(x,timeLastExplain) {}
+set profile(x,timeLastInit) {}
+set profile(x,welcomeMessage) {
+}
+set profile(x,windowNumber) 17
+set profile(ztest9999,authentication) {}
+set profile(ztest9999,comstack) tcpip
+set profile(ztest9999,databases) Default
+set profile(ztest9999,description) {YAZ server on localhost}
+set profile(ztest9999,host) localhost
+set profile(ztest9999,largeSetLowerBound) 2
+set profile(ztest9999,maxResultSets) {}
+set profile(ztest9999,maxResultSize) {}
+set profile(ztest9999,maxTerms) {}
+set profile(ztest9999,maximumRecordSize) 50000
+set profile(ztest9999,mediumSetPresentNumber) 0
+set profile(ztest9999,multipleDatabases) 1
+set profile(ztest9999,namedResultSets) 1
+set profile(ztest9999,port) 9999
+set profile(ztest9999,preferredMessageSize) 30000
+set profile(ztest9999,presentChunk) 4
+set profile(ztest9999,protocol) Z39
+set profile(ztest9999,queryCCL) 0
+set profile(ztest9999,queryRPN) 1
+set profile(ztest9999,recentNews) {}
+set profile(ztest9999,smallSetUpperBound) 0
+set profile(ztest9999,targetInfoName) {}
+set profile(ztest9999,timeDefine) 878567355
+set profile(ztest9999,timeLastExplain) {}
+set profile(ztest9999,timeLastInit) 879437957
+set profile(ztest9999,welcomeMessage) {}
+set profile(ztest9999,windowNumber) 7
 set queryTypes {Simple phrase}
 set queryButtons {{{I 3} {I 0} {I 0}} {{I 0} {I 1} {I 0}}}
-set queryInfo {{ {Title {1=4}} {Author {1=1}} {Subject {1=21}} {Any {1=1016}} {Query 1=1016 2=102} {Title-rank 1=4 2=102} {Date/time 1=1012} {Title-regular 1=4 2=3 4=2 5=102}} {{Title 1=4 4=1 6=2} {Author 1=1003 4=1 6=2} {ISBN 1=7} {ISSN 1=8} {Year 1=30 4=4 6=2} {Any {}}}}
+set queryInfo {{{Title {1=4}} {Author {1=1}} {Subject {1=21}} {Any {1=1016}} {Query 1=1016 2=102} {Title-rank 1=4 2=102} {Date/time 1=1012} {Title-regular 1=4 2=3 4=2 5=102} {Ranked 1=1016 2=102 3=3 4=1 6=1}} {{Title 1=4 4=1 6=2} {Author 1=1003 4=1 6=2} {ISBN 1=7} {ISSN 1=8} {Year 1=30 4=4 6=2} {Any {}}}}
diff --git a/explain.tcl b/explain.tcl
index 9c45458..d3049e0 100644
--- a/explain.tcl
+++ b/explain.tcl
@@ -1,6 +1,9 @@
 
-proc explain-search {target zz category finish response fresponse} {
-    z39 callback [list explain-search-r $target $zz $category $finish \
+# Procedure explain-search
+#  Issue search request with explain-attribute set and specific
+#  category.
+proc explain-search-request {target zz category finish response fresponse} {
+    z39 callback [list explain-search-response $target $zz $category $finish \
             $response $fresponse]
     ir-set $zz z39
     $zz databaseNames IR-Explain-1
@@ -8,7 +11,9 @@ proc explain-search {target zz category finish response fresponse} {
     $zz search "@attrset exp1 @attr 1=1 $category"
 }
 
-proc explain-search-r {target zz category finish response fresponse} {
+# Procedure explain-search-response
+#  Deal with search response.
+proc explain-search-response {target zz category finish response fresponse} {
     global cancelFlag
 
     apduDump
@@ -29,65 +34,92 @@ proc explain-search-r {target zz category finish response fresponse} {
     set rr [$zz numberOfRecordsReturned]
     set cnt [expr $cnt - $rr]
     if {$cnt <= 0} {
-        $response $target $zz $category $finish
+	explain-present-response $target $zz $category $finish \
+	    $response $fresponse
         return
     }
-    z39 callback [list $response $target $zz $category $finish]
+    z39 callback [list explain-present-response $target $zz $category $finish \
+		      $response $fresponse]
     incr rr
     $zz present $rr $cnt
 }
 
-proc explain-check {target finish} {
-    global profile
+# Procedure explain-present-response
+#  Deal with explain present response.
+proc explain-present-response {target zz category finish response fresponse} {
+    global cancelFlag
 
-    set time [clock seconds]
-    set etime [lindex $profile($target) 19]
-    if {[string length $etime]} {
-        # Check last explain. If 1 day since last explain do explain egain.
-        # 1 day = 86400
-        if {$time > [expr 180 + $etime]} {
-            explain-start $target $finish
-            return
-        }
-    } else {
-        # Check last init. If never init or 1 week after do explain anyway.
-        # 1 week = 604800
-        set etime [lindex $profile($target) 18]
-        if {![string length $etime]} {
-            explain-start $target $finish
-            return
-        } elseif {$time > [expr 604800 + $etime]} {
-            explain-start $target $finish
-            return
-        }
+    apduDump
+    if {$cancelFlag} {
+        close-target
+        return
     }
-    eval $finish [list $target]
+    set cnt [$zz resultCount]
+    ir-log debug "cnt=$cnt"
+    for {set i 1} {$i <= $cnt} {incr i} {
+	if {[string compare [$zz type $i] DB]} {
+	    $fresponse $target $zz $category $finish
+	    return
+	}
+	if {[string compare [$zz recordType $i] Explain]} {
+	    $fresponse $target $zz $category $finish
+	    return
+	}
+    }
+    $response $target $zz $category $finish
 }
 
-proc explain-start {target finish} {
+
+# Procedure explain-check-0
+#  Phase 0: CategoryList
+proc explain-check-0 {target finish} {
     show-status Explaining 1 0
-    show-message TargetInfo
-    explain-search $target z39.targetInfo TargetInfo $finish \
-            explain-check-1 explain-check-1f
+    show-message CategoryList
+    explain-search-request $target z39.categoryList CategoryList $finish \
+            explain-check-5 explain-check-fail
 }
 
-proc explain-check-1f {target zz category finish} {
-    eval $finish [list $target]
+# Procedure explain-check-5
+#  TargetInfo
+proc explain-check-5 {target zz category finish} {
+    show-status Explaining 1 0
+    show-message TargetInfo
+
+    if {![catch {set rec [z39.categoryList getExplain $no databaseInfo]}]} {
+	dputs $rec
+    }
+    explain-search-request $target z39.targetInfo TargetInfo $finish \
+            explain-check-10 explain-check-fail
 }
 
-proc explain-check-1 {target zz category finish} {
+# Procedure explain-check-10
+#  DatabaseInfo
+proc explain-check-10 {target zz category finish} {
     show-status Explaining 1 0
     show-message DatabaseInfo
-    explain-search $target z39.databaseInfo DatabaseInfo $finish \
-            explain-check-2 explain-check-1f
+    explain-search-request $target z39.databaseInfo DatabaseInfo $finish \
+            explain-check-ok explain-check-fail
+}
+
+# Proedure explain-check-fail
+#  Deal with explain check failure - call finish handler
+proc explain-check-fail {target zz category finish} {
+    eval $finish [list $target]
 }
 
-proc explain-check-2 {target zz category finish} {
+
+# Procedure explain-check-ok
+proc explain-check-ok {target zz category finish} {
     global profile settingsChanged
 
+    set trec [z39.categoryList getExplain 1 categoryList]
+    puts "--- categoryList"
+    puts $trec
+
     set trec [z39.targetInfo getExplain 1 targetInfo]
     puts "--- targetInfo"
     puts $trec
+
     set no 1
     while {1} {
         if {[catch {set rec \
@@ -102,42 +134,64 @@ proc explain-check-2 {target zz category finish} {
         incr no
     }
     if {[info exists dbList]} {
-        set profile($target) [lreplace $profile($target) 7 7 $dbList]
-        set profile($target) [lreplace $profile($target) 25 25 {}]
+        set profile($target,databases) $dbList
     }
     cascade-target-list
     
     set data [lindex [lindex [lindex [lindex [lindex $trec 12] 1] 1] 1] 1]
     if {[string length $data]} {
-        set profile($target) [lreplace $profile($target) 0 0 $data]
-    }
-
-    set l [llength $profile($target)]
-    while {$l < 29} {
-        lappend profile($target) {}
-        incr l
+        set profile($target,descripton) $data
     }
 
-    set profile($target) [lreplace $profile($target) 8 8 \
-            [lindex [lindex $trec 4] 1]]
-    set profile($target) [lreplace $profile($target) 19 19 \
-            [clock seconds]]
-    set profile($target) [lreplace $profile($target) 20 20 \
-            [lindex [lindex $trec 1] 1]]
-    set profile($target) [lreplace $profile($target) 21 21 \
-            [lindex [lindex $trec 2] 1]]
-    set profile($target) [lreplace $profile($target) 22 22 \
-            [lindex [lindex $trec 6] 1]]
-    set profile($target) [lreplace $profile($target) 23 23 \
-            [lindex [lindex $trec 7] 1]]
-    set profile($target) [lreplace $profile($target) 24 24 \
-            [lindex [lindex $trec 8] 1]]
-    set profile($target) [lreplace $profile($target) 26 26 \
-            [lindex [lindex $trec 5] 1]]
-    set profile($target) [lreplace $profile($target) 27 27 \
-            [lindex [lindex [lindex [lindex [lindex $trec 10] 1] 1] 1] 1]]
-
+    set profile($target,namedResultSets) [lindex [lindex $trec 4] 1]
+    set profile($target,timeLastExplain) [clock seconds]
+    set profile($target,targetInfoName) [lindex [lindex $trec 1] 1]
+    set profile($target,recentNews) [lindex [lindex $trec 2] 1]
+    set profile($target,maxResultSets) [lindex [lindex $trec 6] 1]
+    set profile($target,maxResultSize) [lindex [lindex $trec 7] 1]
+    set profile($target,maxTerms) [lindex [lindex $trec 8] 1]
+    set profile($target,multipleDatabases) [lindex [lindex $trec 5] 1]
+    set profile($target,welcomeMessage) \
+	[lindex [lindex [lindex [lindex [lindex $trec 10] 1] 1] 1] 1]
+    
     set settingsChanged 1
 
     eval $finish [list $target]
 }
+
+# Procedure explain-refresh
+proc explain-refresh {target finish} {
+    explain-check-0 $target $finish
+}
+
+# Procedure explain-check
+#   Checks target for explain database.
+#   Evals "$finish $target" on finish.
+proc explain-check {target finish} {
+    global profile
+    
+    set refresh 0
+    set time [clock seconds]
+    set etime $profile($target,timeLastExplain)
+    if {[string length $etime]} {
+        # Check last explain. If 1 day since last explain do explain egain.
+        # 1 day = 86400
+        if {$time > [expr 180 + $etime]} {
+	    set refresh 1
+        }
+    } else {
+        # Check last init. If never init or 1 week after do explain anyway.
+        # 1 week = 604800
+        set etime $profile($target,timeLastInit)
+        if {![string length $etime]} {
+	    set refresh 1
+        } elseif {$time > [expr 604800 + $etime]} {
+	    set refresh 1
+        }
+    }
+    if {$refresh} {
+	explain-refresh $target $finish
+    } else {
+	eval $finish [list $target]
+    }
+}
diff --git a/setup.tcl b/setup.tcl
index 5696cb7..4e617da 100644
--- a/setup.tcl
+++ b/setup.tcl
@@ -4,19 +4,13 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: setup.tcl,v $
-# Revision 1.1  1996-09-13 10:54:25  adam
-# Started work on Explain in client.
+# Revision 1.2  1997-11-19 11:20:57  adam
+# New target profile format - associative arrrays instead of LONG lists.
 #
+# Revision 1.1  1996/09/13 10:54:25  adam
+# Started work on Explain in client.
 #
 
-set pref(font,h1) {-Adobe-Helvetica-Bold-R-Normal-*-240-*}
-set pref(font,h2) {-Adobe-Helvetica-Bold-R-Normal-*-180-*}
-set pref(font,h3) {-Adobe-Helvetica-Bold-R-Normal-*-140-*}
-set pref(font,h4) {-Adobe-Helvetica-Bold-R-Normal-*-120-*}
-
-set pref(font,s1) {-Adobe-Helvetica-Bold-R-Normal-*-100-*}
-set pref(font,s2) {-Adobe-Helvetica-Bold-R-Normal-*-80-*}
-
 proc print-date {w msg date} {
     frame $w
     pack $w -side top -fill x
@@ -50,42 +44,9 @@ proc entry-fieldsx {width parent list tlist returnAction escapeAction} {
 proc protocol-setup {target} {
     global profileS profile
     
-    set tinfo $profile($target)
-
-    set profileS($target,targetDescription) [lindex $tinfo 0]
-    set profileS($target,host) [lindex $tinfo 1]
-    set profileS($target,port) [lindex $tinfo 2]
-    set profileS($target,idAuthentication) [lindex $tinfo 3]
-    set profileS($target,targetMRS) [lindex $tinfo 4]
-
-    set profileS($target,targetPMS) [lindex $tinfo 5]
-    set profileS($target,comstack) [lindex $tinfo 6]
-    set profileS($target,databases) [lindex $tinfo 7]
-    set profileS($target,targetResultSets) [lindex $tinfo 8]
-    set profileS($target,RPN) [lindex $tinfo 9]
-    set profileS($target,CCL) [lindex $tinfo 10]
-
-    set profileS($target,protocolType) [lindex $tinfo 11]
-    set profileS($target,wno) [lindex $tinfo 12]
-    set profileS($target,LSLB) [lindex $tinfo 13]
-    set profileS($target,SSUB) [lindex $tinfo 14]
-
-    set profileS($target,MSPN) [lindex $tinfo 15]
-    set profileS($target,PresentChunk) [lindex $tinfo 16]
-    set profileS($target,timeDefine) [lindex $tinfo 17]
-    set profileS($target,timeInit) [lindex $tinfo 18]
-    set profileS($target,timeExplain) [lindex $tinfo 19]
-
-    set profileS($target,targetName) [lindex $tinfo 20]
-    set profileS($target,targetRecentNews) [lindex $tinfo 21]
-    set profileS($target,targetMaxResultSets) [lindex $tinfo 22]
-    set profileS($target,targetMaxResultSize) [lindex $tinfo 23]
-    set profileS($target,targetMaxTerms) [lindex $tinfo 24]
-
-    set profileS($target,spare) [lindex $tinfo 25]
-    set profileS($target,targetMultipleDatabases) [lindex $tinfo 26]
-    set profileS($target,targetWelcome) [lindex $tinfo 27]
-
+    foreach n [array names profile $target,*] {
+	set profileS($n) $profile($n)
+    }
     target-setup $target 0 0
 }
 
@@ -96,37 +57,11 @@ proc protocol-setup-action {target} {
     if {![string length $timedef]} {
         set timedef [clock seconds]
     }
-    set profile($target) [list \
-            $profileS($target,targetDescription) \
-            $profileS($target,host) \
-            $profileS($target,port) \
-            $profileS($target,idAuthentication) \
-            $profileS($target,targetMRS) \
-            $profileS($target,targetPMS) \
-            $profileS($target,comstack) \
-            $profileS($target,databases) \
-            $profileS($target,targetResultSets) \
-            $profileS($target,RPN) \
-            $profileS($target,CCL) \
-            $profileS($target,protocolType) \
-            $profileS($target,wno) \
-            $profileS($target,LSLB) \
-            $profileS($target,SSUB) \
-            $profileS($target,MSPN) \
-            $profileS($target,PresentChunk) \
-            $profileS($target,timeDefine) \
-            $profileS($target,timeInit) \
-            $profileS($target,timeExplain) \
-            $profileS($target,targetName) \
-            $profileS($target,targetRecentNews) \
-            $profileS($target,targetMaxResultSets) \
-            $profileS($target,targetMaxResultSize) \
-            $profileS($target,targetMaxTerms) \
-            $profileS($target,spare) \
-            $profileS($target,targetMultipleDatabases) \
-            $profileS($target,targetWelcome) \
-            ]
 
+    foreach n [array names profileS $target,*] {
+	set profile($n) $profileS($n)
+	unset profileS($n)
+    }
     set settingsChanged 1
 
     cascade-target-list
@@ -177,9 +112,6 @@ proc target-setup-leave-0 {target} {
     set w .setup100
     set y $w.top.hostport
 
-    set profileS($target,host) [$y.host.entry get]
-    set profileS($target,port) [$y.port.entry get]
-    set profileS($target,idAuthentication) [$y.idAuthentication.entry get]
 }
 
 proc target-setup-enter-0 {target} {
@@ -204,9 +136,12 @@ proc target-setup-enter-0 {target} {
             {{Host:} {Port:} {Id Authentication:}} \
             [list target-setup $target 0 2] [list destroy $w]
 
-    $y.host.entry insert 0 $profileS($target,host)
-    $y.port.entry insert 0 $profileS($target,port)
-    $y.idAuthentication.entry insert 0 $profileS($target,idAuthentication)
+    $y.host.entry configure -textvariable \
+	profileS($target,host)
+    $y.port.entry configure -textvariable \
+	profileS($target,port)
+    $y.idAuthentication.entry configure -textvariable \
+	profileS($target,idAuthentication)
 
     # bottom
 
@@ -224,8 +159,8 @@ proc target-setup-enter-0 {target} {
     label $y.label -text "Dates"
     pack $y.label -side top -fill x
     print-date $w.top.dates.a {Defined:}      $profileS($target,timeDefine)
-    print-date $w.top.dates.b {Last Access:}  $profileS($target,timeInit)
-    print-date $w.top.dates.c {Last Explain:} $profileS($target,timeExplain)
+    print-date $w.top.dates.b {Last Access:}  $profileS($target,timeLastInit)
+    print-date $w.top.dates.c {Last Explain:} $profileS($target,timeLastExplain)
 
     # protocol . . .
 
@@ -236,9 +171,9 @@ proc target-setup-enter-0 {target} {
     
     label $y.label -text "Protocol" 
     radiobutton $y.z39v2 -text "Z39.50" -anchor w \
-            -variable profileS($target,protocolType) -value Z39
+            -variable profileS($target,protocol) -value Z39
     radiobutton $y.sr -text "SR" -anchor w \
-            -variable profileS($target,protocolType) -value SR
+            -variable profileS($target,protocol) -value SR
     
     pack $y.label $y.z39v2 $y.sr -padx 2 -side top -fill x
 
@@ -263,15 +198,12 @@ proc target-setup-leave-1 {target} {
     set w .setup100
     set y $w.top.nr
 
-    set profileS($target,targetName) [$y.name.text get 0.0 end]
-    set profileS($target,targetRecentNews) [$y.recentNews.text get 0.0 end]
-    set profileS($target,targetDescription) [$y.description.text get 0.0 end]
+    set profileS($target,targetInfoName) [$y.name.text get 0.0 end]
+    set profileS($target,recentNews) [$y.recentNews.text get 0.0 end]
+    set profileS($target,description) [$y.description.text get 0.0 end]
+    set profileS($target,welcomeMessage) [$y.welcome.text get 0.0 end]
 
     set y $w.top.rs
-
-    set profileS($target,targetMaxResultSets) [$y.maxResultSets.entry get]
-    set profileS($target,targetMaxResultSize) [$y.maxResultSize.entry get]
-    set profileS($target,targetMaxTerms) [$y.maxTerms.entry get]
 }
 
 proc target-setup-enter-1 {target} {
@@ -299,7 +231,7 @@ proc target-setup-enter-1 {target} {
     text $y.name.text -width 40 -height 2 -relief sunken -border 1 \
             -wrap word
     TextEditable $y.name.text
-    $y.name.text insert end $profileS($target,targetName)
+    $y.name.text insert end $profileS($target,targetInfoName)
     pack $y.name.text -side right -fill x -expand yes
     
     label $y.recentNews.label -text "Recent News" -width 15
@@ -307,7 +239,7 @@ proc target-setup-enter-1 {target} {
     text $y.recentNews.text -width 40 -height 2 -relief sunken -border 1 \
             -wrap word
     TextEditable $y.recentNews.text
-    $y.recentNews.text insert end $profileS($target,targetRecentNews)
+    $y.recentNews.text insert end $profileS($target,recentNews)
     pack $y.recentNews.text -side right -fill x -expand yes
 
     label $y.description.label -text "Description" -width 15
@@ -315,7 +247,7 @@ proc target-setup-enter-1 {target} {
     text $y.description.text -width 40 -height 4 -relief sunken -border 1 \
             -wrap word
     TextEditable $y.description.text
-    $y.description.text insert end $profileS($target,targetDescription)
+    $y.description.text insert end $profileS($target,description)
     pack $y.description.text -side right -fill x -expand yes
 
     label $y.welcome.label -text "Welcome Message" -width 15
@@ -323,7 +255,7 @@ proc target-setup-enter-1 {target} {
     text $y.welcome.text -width 40 -height 4 -relief sunken -border 1 \
             -wrap word
     TextEditable $y.welcome.text
-    $y.welcome.text insert end $profileS($target,targetWelcome)
+    $y.welcome.text insert end $profileS($target,welcomeMessage)
     pack $y.welcome.text -side right -fill x -expand yes
     
     # Result Sets Size, numbers, etc. . . .
@@ -344,9 +276,12 @@ proc target-setup-enter-1 {target} {
             {{Max Result Sets:} {Max Result Size:} {Max Terms:}} \
             [list target-setup $target 1 2] [list destroy $w]
 
-    $y.maxResultSets.entry insert 0 $profileS($target,targetMaxResultSets)
-    $y.maxResultSize.entry insert 0 $profileS($target,targetMaxResultSize)
-    $y.maxTerms.entry insert 0 $profileS($target,targetMaxTerms)
+    $y.maxResultSets.entry configure \
+	-textvariable profileS($target,targetMaxResultSets)
+    $y.maxResultSize.entry configure \
+	-textvariable profileS($target,targetMaxResultSize)
+    $y.maxTerms.entry configure \
+	-textvariable profileS($target,targetMaxTerms)
 
     # Checkbuttons . . .
     set y $w.top.ns
@@ -355,10 +290,10 @@ proc target-setup-enter-1 {target} {
     pack $y -side right -padx 2 -pady 2 -fill both -expand yes
 
     checkbutton $y.resultSets -text "Named Result Sets" \
-            -anchor n -variable profileS($target,targetResultSets)
+            -anchor n -variable profileS($target,namedResultSets)
     
     checkbutton $y.multipleDatabases -text "Multiple Database Search" \
-            -anchor n -variable profileS($target,targetMultipleDatabases)
+            -anchor n -variable profileS($target,multipleDatabases)
 
     pack $y.resultSets $y.multipleDatabases -side top -padx 2 -pady 2
 
@@ -400,11 +335,8 @@ proc target-setup-db-add-action {target wp} {
     set w .database-select
 
     set db [$w.top.database.entry get]
-    if {![string length [lindex $profileS($target,databases) 0]]} {
-        set profileS($target,databases) $db
-    } else {
-        lappend profileS($target,databases) $db
-    }
+    lappend profileS($target,databases) $db
+
     destroy $w
     target-setup-dblist-update $target
 }
@@ -424,6 +356,10 @@ proc target-setup-db-remove {target wp} {
                     [lreplace $profileS($target,databases) $i $i]
         }
         target-setup-dblist-update $target
+        if {![llength $profileS($target,databases)]} {
+            unset profileS($target,databases)
+            puts removed
+        }
     }
 }
 
@@ -434,13 +370,15 @@ proc target-setup-dblist-update {target} {
     set y $w.top.name
 
     set no 0
-    set databaseList $profileS($target,databases)
-    $y.data configure -text [lindex $databaseList 0]
-    $y.data.m delete 0 100
-    foreach d $databaseList {
-        $y.data.m add command -label $d -command \
+    if {[info exists profileS($target,databases)]} {
+        set databaseList $profileS($target,databases)
+        $y.data configure -text [lindex $databaseList 0]
+        $y.data.m delete 0 100
+        foreach d $databaseList {
+             $y.data.m add command -label $d -command \
                 [list target-setup-2-dbselect $y.data $d]
-        incr no
+            incr no
+        }
     }
     if {$no == 0} {
         $y.remove configure -state disabled
@@ -454,8 +392,6 @@ proc target-setup-enter-2 {target} {
 
     set w .setup100
 
-    set databaseList $profileS($target,databases)
-    
     wm title $w "$target - Database Information"
     
     frame $w.top.name -border 2
@@ -465,7 +401,7 @@ proc target-setup-enter-2 {target} {
     
     pack $w.top.name.label -side left
     menubutton $w.top.name.data -menu $w.top.name.data.m -relief raised
-    menu $w.top.name.data.m
+    irmenu $w.top.name.data.m
 
     pack $w.top.name.data -side left
    
-- 
1.7.10.4