X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ir-tcl.c;h=f49c97b571a2fd29dae55b7057935e51e57a3aee;hb=a78acc150da77d8c6ef548642dc29622427687a0;hp=6c1c0cb8118ab31e6ed99f25d2f6c0ac139421b1;hpb=aa3f048cf3fe92e08f6de03cc10d1affb1c51d29;p=ir-tcl-moved-to-github.git

diff --git a/ir-tcl.c b/ir-tcl.c
index 6c1c0cb..f49c97b 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -1,10 +1,73 @@
 /*
  * IR toolkit for tcl/tk
  * (c) Index Data 1995
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.26  1995-04-18 16:11:51  adam
+ * Revision 1.43  1995-06-19 13:06:08  adam
+ * New define: IR_TCL_VERSION.
+ *
+ * Revision 1.42  1995/06/19  08:08:52  adam
+ * client.tcl: hotTargets now contain both database and target name.
+ * ir-tcl.c: setting protocol edited. Errors in callbacks are logged
+ * by logf(LOG_WARN, ...) calls.
+ *
+ * Revision 1.41  1995/06/16  12:28:16  adam
+ * Implemented preferredRecordSyntax.
+ * Minor changes in diagnostic handling.
+ * Record list deleted when connection closes.
+ *
+ * Revision 1.40  1995/06/14  13:37:18  adam
+ * Setting recordType implemented.
+ * Setting implementationVersion implemented.
+ * Settings implementationId / implementationName edited.
+ *
+ * Revision 1.39  1995/06/08  10:26:32  adam
+ * Bug fix in ir_strdup.
+ *
+ * Revision 1.38  1995/06/01  16:36:47  adam
+ * About buttons. Minor bug fixes.
+ *
+ * Revision 1.37  1995/06/01  07:31:20  adam
+ * Rename of many typedefs -> IrTcl_...
+ *
+ * Revision 1.36  1995/05/31  13:09:59  adam
+ * Client searches/presents may be interrupted.
+ * New moving book-logo.
+ *
+ * Revision 1.35  1995/05/31  08:36:33  adam
+ * Bug fix in client.tcl: didn't save options on clientrc.tcl.
+ * New method: referenceId. More work on scan.
+ *
+ * Revision 1.34  1995/05/29  10:33:42  adam
+ * README and rename of startup script.
+ *
+ * Revision 1.33  1995/05/29  09:15:11  quinn
+ * Changed CS_SR to PROTO_SR, etc.
+ *
+ * Revision 1.32  1995/05/29  08:44:16  adam
+ * Work on delete of objects.
+ *
+ * Revision 1.31  1995/05/26  11:44:10  adam
+ * Bugs fixed. More work on MARC utilities and queries. Test
+ * client is up-to-date again.
+ *
+ * Revision 1.30  1995/05/26  08:54:11  adam
+ * New MARC utilities. Uses prefix query.
+ *
+ * Revision 1.29  1995/05/24  14:10:22  adam
+ * Work on idAuthentication, protocolVersion and options.
+ *
+ * Revision 1.28  1995/05/23  15:34:48  adam
+ * Many new settings, userInformationField, smallSetUpperBound, etc.
+ * A number of settings are inherited when ir-set is executed.
+ * This version is incompatible with the graphical test client (client.tcl).
+ *
+ * Revision 1.27  1995/05/11  15:34:47  adam
+ * Scan request changed a bit. This version works with RLG.
+ *
+ * Revision 1.26  1995/04/18  16:11:51  adam
  * First version of graphical Scan. Some work on query-by-form.
  *
  * Revision 1.25  1995/04/17  09:37:17  adam
@@ -65,7 +128,7 @@
  *
  * Revision 1.8  1995/03/15  08:25:16  adam
  * New method presentStatus to check for error on present. Misc. cleanup
- * of IRRecordList manipulations. Full MARC record presentation in
+ * of IrTcl_RecordList manipulations. Full MARC record presentation in
  * search.tcl.
  *
  * Revision 1.7  1995/03/14  17:32:29  adam
@@ -88,153 +151,31 @@
 #include <sys/time.h>
 #include <assert.h>
 
-#include <tcl.h>
-
-#include <yaz-ccl.h>
-#include <iso2709.h>
-#include <comstack.h>
-#include <tcpip.h>
-
-#if MOSI
-#include <xmosi.h>
-#endif
-
-#include <odr.h>
-#include <proto.h>
-#include <oid.h>
-#include <diagbib1.h>
-
-#include "ir-tcl.h"
-
 #define CS_BLOCK 0
 
-typedef struct {
-    char       *cs_type;
-    char       *protocol_type;
-    int         connectFlag;
-    COMSTACK    cs_link;
-
-    int         preferredMessageSize;
-    int         maximumRecordSize;
-    Odr_bitmask options;
-    Odr_bitmask protocolVersion;
-    char       *idAuthentication;
-    char       *implementationName;
-    char       *implementationId;
-
-    char       *hostname;
-   
-    char       *buf_out;
-    int         len_out;
-
-    char       *buf_in;
-    int         len_in;
-
-    char       *sbuf;
-    int         slen;
-
-    ODR         odr_in;
-    ODR         odr_out;
-    ODR         odr_pr;
-
-    Tcl_Interp *interp;
-    char       *callback;
-    char       *failback;
-
-    int         smallSetUpperBound;
-    int         largeSetLowerBound;
-    int         mediumSetPresentNumber;
-    int         replaceIndicator;
-    char      **databaseNames;
-    int         num_databaseNames;
-    char       *query_method;
-
-    CCL_bibset  bibset;
-    oident      bib1;
-
-    struct IRSetObj_ *set_child;
-    struct IRScanObj_ *scan_child;
-} IRObj;
-
-typedef struct IRRecordList_ {
-    int no;
-    int which;
-    union {
-        struct {
-            Iso2709Rec rec;
-        } marc;
-        struct {
-            int  condition;
-            char *addinfo;
-        } diag;
-    } u;
-    struct IRRecordList_ *next;
-} IRRecordList;
-
-typedef struct IRSetObj_ {
-    IRObj      *parent;
-    int         searchStatus;
-    int         resultCount;
-    int         start;
-    int         number;
-    int         numberOfRecordsReturned;
-    char       *setName;
-    int         recordFlag;
-    int         which;
-    int         condition;
-    char       *addinfo;
-    IRRecordList *record_list;
-} IRSetObj;
-
-typedef struct IRScanEntry_ {
-    int         which;
-    union {
-        struct {
-	    char *buf;
-	    int  globalOccurrences;
-	} term;
-	struct {
-	    int  condition;
-	    char *addinfo;
-	} diag;
-    } u;
-} IRScanEntry;
-
-typedef struct IRScanDiag_ {
-    int         dummy;
-} IRScanDiag;
-
-typedef struct IRScanObj_ {
-    IRObj      *parent;
-    int         stepSize;
-    int         numberOfTermsRequested;
-    int         preferredPositionInResponse;
-
-    int         scanStatus;
-    int         numberOfEntriesReturned;
-    int         positionOfTerm;
-
-    int         entries_flag;
-    int         which;
-
-    int         num_entries;
-    int         num_diagRecs;
-
-    IRScanEntry *entries;
-    IRScanDiag  *nonSurrogateDiagnostics;
-} IRScanObj;
+#include "ir-tclp.h"
 
 typedef struct {
     int type;
     char *name;
     int (*method) (void *obj, Tcl_Interp *interp, int argc, char **argv);
-} IRMethod;
+} IrTcl_Method;
+
+typedef struct {
+    void *obj;
+    IrTcl_Method *tab;
+} IrTcl_Methods;
 
-static int do_disconnect (void *obj,Tcl_Interp *interp, int argc, char **argv);
+static Tcl_Interp *irTcl_interp;
 
-static IRRecordList *new_IR_record (IRSetObj *setobj, int no, int which)
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);
+static int do_disconnect (void *obj, Tcl_Interp *interp, 
+                          int argc, char **argv);
+
+static IrTcl_RecordList *new_IR_record (IrTcl_SetObj *setobj, 
+                                        int no, int which)
 {
-    IRRecordList *rl;
+    IrTcl_RecordList *rl;
 
     for (rl = setobj->record_list; rl; rl = rl->next)
     {
@@ -243,11 +184,12 @@ static IRRecordList *new_IR_record (IRSetObj *setobj, int no, int which)
             switch (rl->which)
             {
             case Z_NamePlusRecord_databaseRecord:
-                iso2709_rm (rl->u.marc.rec);
+	        free (rl->u.dbrec.buf);
+		rl->u.dbrec.buf = NULL;
                 break;
             case Z_NamePlusRecord_surrogateDiagnostic:
-                free (rl->u.diag.addinfo);
-                rl->u.diag.addinfo = NULL;
+                ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+                                &rl->u.surrogateDiagnostics.num);
                 break;
             }
             break;
@@ -265,9 +207,77 @@ static IRRecordList *new_IR_record (IRSetObj *setobj, int no, int which)
     return rl;
 }
 
-static IRRecordList *find_IR_record (IRSetObj *setobj, int no)
+static struct {
+    enum oid_value value;
+    const char *name;
+} IrTcl_recordSyntaxTab[] = { 
+{ VAL_UNIMARC,    "UNIMARC" },
+{ VAL_INTERMARC,  "INTERMARC" },
+{ VAL_CCF,        "CCF" },
+{ VAL_USMARC,     "USMARC" },
+{ VAL_UKMARC,     "UKMARC" },
+{ VAL_NORMARC,    "NORMARC" },
+{ VAL_LIBRISMARC, "LIBRISMARC" },
+{ VAL_DANMARC,    "DANMARC" },
+{ VAL_FINMARC,    "FINMARC" },
+{ VAL_MAB,        "MAB" },
+{ VAL_CANMARC,    "CANMARC" },
+{ VAL_SBN,        "SBN" },
+{ VAL_PICAMARC,   "PICAMARC" },
+{ VAL_AUSMARC,    "AUSMARC" },
+{ VAL_IBERMARC,   "IBERMARC" },
+{ VAL_SUTRS,      "SUTRS" },
+{ 0, NULL }
+};
+
+/* 
+ * IrTcl_eval
+ */
+int IrTcl_eval (Tcl_Interp *interp, const char *command)
 {
-    IRRecordList *rl;
+    char *tmp = malloc (strlen(command)+1);
+    int r;
+
+    if (!tmp)
+    {
+        logf (LOG_FATAL, "Out of memory in IrTcl_eval");
+        exit (1);
+    }
+    strcpy (tmp, command);
+    r = Tcl_Eval (interp, tmp);
+    if (r == TCL_ERROR)
+        logf (LOG_WARN, "Tcl error in line %d: %s", interp->errorLine, interp->result);
+    free (tmp);
+    return r;
+}
+
+/*
+ * IrTcl_getRecordSyntaxStr: Return record syntax name of object id
+ */
+static const char *IrTcl_getRecordSyntaxStr (enum oid_value value)
+{
+    int i;
+    for (i = 0; IrTcl_recordSyntaxTab[i].name; i++) 
+        if (IrTcl_recordSyntaxTab[i].value == value)
+            return IrTcl_recordSyntaxTab[i].name;
+    return "USMARC";
+}
+
+/*
+ * IrTcl_getRecordSyntaxVal: Return record syntax value of string
+ */
+static enum oid_value IrTcl_getRecordSyntaxVal (const char *name)
+{
+    int i;
+    for (i = 0; IrTcl_recordSyntaxTab[i].name; i++) 
+        if (!strcmp (IrTcl_recordSyntaxTab[i].name, name))
+            return IrTcl_recordSyntaxTab[i].value;
+    return 0;
+}
+
+static IrTcl_RecordList *find_IR_record (IrTcl_SetObj *setobj, int no)
+{
+    IrTcl_RecordList *rl;
 
     for (rl = setobj->record_list; rl; rl = rl->next)
         if (no == rl->no)
@@ -275,8 +285,30 @@ static IRRecordList *find_IR_record (IRSetObj *setobj, int no)
     return NULL;
 }
 
+static void delete_IR_records (IrTcl_SetObj *setobj)
+{
+    IrTcl_RecordList *rl, *rl1;
+
+    for (rl = setobj->record_list; rl; rl = rl1)
+    {
+        switch (rl->which)
+        {
+        case Z_NamePlusRecord_databaseRecord:
+	    free (rl->u.dbrec.buf);
+            break;
+        case Z_NamePlusRecord_surrogateDiagnostic:
+            ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+                            &rl->u.surrogateDiagnostics.num);
+            break;
+	}
+	rl1 = rl->next;
+	free (rl);
+    }
+    setobj->record_list = NULL;
+}
+
 /*
- * getsetint: Set/get integer value
+ * get_set_int: Set/get integer value
  */
 static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
 {
@@ -293,74 +325,30 @@ static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
 }
 
 /*
- * mk_nonSurrogateDiagnostics: Make Tcl result with diagnostic info
- */
-static int mk_nonSurrogateDiagnostics (Tcl_Interp *interp, 
-                                       int condition,
-				       const char *addinfo)
-{
-    char buf[20];
-    const char *cp;
-
-    Tcl_AppendElement (interp, "NSD");
-    sprintf (buf, "%d", condition);
-    Tcl_AppendElement (interp, buf);
-    cp = diagbib1_str (condition);
-    if (cp)
-        Tcl_AppendElement (interp, (char*) cp);
-    else
-        Tcl_AppendElement (interp, "");
-    if (addinfo)
-        Tcl_AppendElement (interp, (char*) addinfo);
-    else
-        Tcl_AppendElement (interp, "");
-    return TCL_OK;
-}
-
-/*
- * get_parent_info: Returns information about parent object.
+ * ir_method: Search for method in table and invoke method handler
  */
-static int get_parent_info (Tcl_Interp *interp, const char *name,
-			    Tcl_CmdInfo *parent_info,
-			    const char **suffix)
+int ir_method (Tcl_Interp *interp, int argc, char **argv, IrTcl_Methods *tab)
 {
-    char parent_name[128];
-    const char *csep = strrchr (name, '.');
-    int pos;
+    IrTcl_Methods *tab_i = tab;
+    IrTcl_Method *t;
 
-    if (!csep)
-    {
-        interp->result = "missing .";
-        return TCL_ERROR;
-    }
-    if (suffix)
-        *suffix = csep+1;
-    pos = csep-name;
-    if (pos > 127)
-        pos = 127;
-    memcpy (parent_name, name, pos);
-    parent_name[pos] = '\0';
-    if (!Tcl_GetCommandInfo (interp, parent_name, parent_info))
-    {
-        interp->result = "No parent";
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
+    for (tab_i = tab; tab_i->tab; tab_i++)
+        for (t = tab_i->tab; t->name; t++)
+	    if (argc <= 0)
+	    {
+	        if ((*t->method)(tab_i->obj, interp, argc, argv) == TCL_ERROR)
+		    return TCL_ERROR;
+            }
+	    else
+                if (!strcmp (t->name, argv[1]))
+                    return (*t->method)(tab_i->obj, interp, argc, argv);
 
-/*
- * ir_method: Search for method in table and invoke method handler
- */
-int ir_method (void *obj, Tcl_Interp *interp, int argc, char **argv,
-               IRMethod *tab)
-{
-    IRMethod *t;
-    for (t = tab; t->name; t++)
-        if (!strcmp (t->name, argv[1]))
-            return (*t->method)(obj, interp, argc, argv);
-    Tcl_AppendResult (interp, "Bad method. Possible values:", NULL);
-    for (t = tab; t->name; t++)
-        Tcl_AppendResult (interp, " ", t->name, NULL);
+    if (argc <= 0)
+        return TCL_OK;
+    Tcl_AppendResult (interp, "Bad method. Possible methods:", NULL);
+    for (tab_i = tab; tab_i->tab; tab_i++)
+        for (t = tab_i->tab; t->name; t++)
+            Tcl_AppendResult (interp, " ", t->name, NULL);
     return TCL_ERROR;
 }
 
@@ -368,7 +356,7 @@ int ir_method (void *obj, Tcl_Interp *interp, int argc, char **argv,
  * ir_method_r: Get status for all readable elements
  */
 int ir_method_r (void *obj, Tcl_Interp *interp, int argc, char **argv,
-                 IRMethod *tab)
+                 IrTcl_Method *tab)
 {
     char *argv_n[3];
     int argc_n;
@@ -387,21 +375,36 @@ int ir_method_r (void *obj, Tcl_Interp *interp, int argc, char **argv,
 }
 
 /*
- * ir_asc2bitmask: Ascii to ODR bitmask conversion
+ *  ir_named_bits: get/set named bits
  */
-int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
+int ir_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob,
+                   Tcl_Interp *interp, int argc, char **argv)
 {
-    const char *cp = asc + strlen(asc);
-    int bitno = 0;
-
-    ODR_MASK_ZERO (ob);
-    do 
+    struct ir_named_entry *ti;
+    if (argc > 0)
     {
-        if (*--cp == '1')
-            ODR_MASK_SET (ob, bitno);
-        bitno++;
-    } while (cp != asc);
-    return bitno;
+        int no;
+        ODR_MASK_ZERO (ob);
+        for (no = 0; no < argc; no++)
+        {
+            for (ti = tab; ti->name; ti++)
+                if (!strcmp (argv[no], ti->name))
+                {
+                    ODR_MASK_SET (ob, ti->pos);
+                    break;
+                }
+            if (!ti->name)
+            {
+                Tcl_AppendResult (interp, "Bad bit mask: ", argv[no], NULL);
+                return TCL_ERROR;
+            }
+        }
+        return TCL_OK;
+    }
+    for (ti = tab; ti->name; ti++)
+        if (ODR_MASK_GET (ob, ti->pos))
+            Tcl_AppendElement (interp, ti->name);
+    return TCL_OK;
 }
 
 /*
@@ -409,6 +412,11 @@ int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
  */
 int ir_strdup (Tcl_Interp *interp, char** p, const char *s)
 {
+    if (!s)
+    {
+        *p = NULL;
+        return TCL_OK;
+    }
     *p = malloc (strlen(s)+1);
     if (!*p)
     {
@@ -420,6 +428,16 @@ int ir_strdup (Tcl_Interp *interp, char** p, const char *s)
 }
 
 /*
+ * ir_strdel: Delete string
+ */
+int ir_strdel (Tcl_Interp *interp, char **p)
+{
+    free (*p);
+    *p = NULL;
+    return TCL_OK;
+}
+
+/*
  * ir_malloc: Malloc function
  */
 void *ir_malloc (Tcl_Interp *interp, size_t size)
@@ -436,60 +454,119 @@ void *ir_malloc (Tcl_Interp *interp, size_t size)
     return p;
 }
 
+static void set_referenceId (ODR o, Z_ReferenceId **dst, const char *src)
+{
+    if (!src || !*src)
+        *dst = NULL;
+    else
+    {
+        *dst = odr_malloc (o, sizeof(**dst));
+	(*dst)->size = (*dst)->len = strlen(src);
+	(*dst)->buf = odr_malloc (o, (*dst)->len);
+	memcpy ((*dst)->buf, src, (*dst)->len);
+    }
+}
+
+static void get_referenceId (char **dst, Z_ReferenceId *src)
+{
+    free (*dst);
+    if (!src)
+    {
+        *dst = NULL;
+	return;
+    }
+    *dst = malloc (src->len+1);
+    memcpy (*dst, src->buf, src->len);
+    (*dst)[src->len] = '\0';
+}
+
 /* ------------------------------------------------------- */
 
 /*
  * do_init_request: init method on IR object
  */
 static int do_init_request (void *obj, Tcl_Interp *interp,
-		       int argc, char **argv)
+                            int argc, char **argv)
 {
-    Z_APDU apdu, *apdup = &apdu;
-    IRObj *p = obj;
-    Z_InitRequest req;
+    Z_APDU *apdu;
+    IrTcl_Obj *p = obj;
+    Z_InitRequest *req;
     int r;
 
+    if (argc <= 0)
+        return TCL_OK;
     if (!p->cs_link)
     {
         interp->result = "not connected";
         return TCL_ERROR;
     }
-    req.referenceId = 0;
-    req.options = &p->options;
-    req.protocolVersion = &p->protocolVersion;
-    req.preferredMessageSize = &p->preferredMessageSize;
-    req.maximumRecordSize = &p->maximumRecordSize;
+    odr_reset (p->odr_out);
+    apdu = zget_APDU (p->odr_out, Z_APDU_initRequest);
+    req = apdu->u.initRequest;
+
+    set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);
+    req->options = &p->options;
+    req->protocolVersion = &p->protocolVersion;
+    req->preferredMessageSize = &p->preferredMessageSize;
+    req->maximumRecordSize = &p->maximumRecordSize;
+
+    if (p->idAuthenticationGroupId)
+    {
+        Z_IdPass *pass = odr_malloc (p->odr_out, sizeof(*pass));
+        Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
 
-    req.idAuthentication = p->idAuthentication;
-    req.implementationId = p->implementationId;
-    req.implementationName = p->implementationName;
-    req.implementationVersion = "0.1";
-    req.userInformationField = 0;
+        auth->which = Z_IdAuthentication_idPass;
+        auth->u.idPass = pass;
+        if (p->idAuthenticationGroupId && *p->idAuthenticationGroupId)
+            pass->groupId = p->idAuthenticationGroupId;
+        else
+            pass->groupId = NULL;
+        if (p->idAuthenticationUserId && *p->idAuthenticationUserId)
+            pass->userId = p->idAuthenticationUserId;
+        else
+            pass->userId = NULL;
+        if (p->idAuthenticationPassword && *p->idAuthenticationPassword)
+            pass->password = p->idAuthenticationPassword;
+        else
+            pass->password = NULL;
+        req->idAuthentication = auth;
+    }
+    else if (!p->idAuthenticationOpen || !*p->idAuthenticationOpen)
+        req->idAuthentication = NULL;
+    else
+    {
+        Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
 
-    apdu.u.initRequest = &req;
-    apdu.which = Z_APDU_initRequest;
+        auth->which = Z_IdAuthentication_open;
+        auth->u.open = p->idAuthenticationOpen;
+        req->idAuthentication = auth;
+    }
+    req->implementationId = p->implementationId;
+    req->implementationName = p->implementationName;
+    req->implementationVersion = p->implementationVersion;
+    req->userInformationField = 0;
 
-    if (!z_APDU (p->odr_out, &apdup, 0))
+    if (!z_APDU (p->odr_out, &apdu, 0))
     {
         Tcl_AppendResult (interp, odr_errlist [odr_geterror (p->odr_out)],
                           NULL);
         odr_reset (p->odr_out);
         return TCL_ERROR;
     }
-    p->sbuf = odr_getbuf (p->odr_out, &p->slen);
+    p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
     if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
     {     
         interp->result = "cs_put failed in init";
-        do_disconnect (p, NULL, 0, NULL);
+        do_disconnect (p, NULL, 2, NULL);
         return TCL_ERROR;
     }
     else if (r == 1)
     {
         ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf("Sent part of initializeRequest (%d bytes).\n", p->slen);
+        logf (LOG_DEBUG, "Sent part of initializeRequest (%d bytes)", p->slen);
     }
     else
-        printf("Sent whole initializeRequest (%d bytes).\n", p->slen);
+        logf (LOG_DEBUG, "Sent whole initializeRequest (%d bytes)", p->slen);
     return TCL_OK;
 }
 
@@ -499,8 +576,30 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
 static int do_protocolVersion (void *obj, Tcl_Interp *interp,
                                int argc, char **argv)
 {
+    int version, i;
+    char buf[10];
+    IrTcl_Obj *p = obj;
+
+    if (argc <= 0)
+    {
+        ODR_MASK_ZERO (&p->protocolVersion);
+	ODR_MASK_SET (&p->protocolVersion, 0);
+	ODR_MASK_SET (&p->protocolVersion, 1);
+        return TCL_OK;
+    }
     if (argc == 3)
-        ir_asc2bitmask (argv[2], &((IRObj *) obj)->protocolVersion);
+    {
+        if (Tcl_GetInt (interp, argv[2], &version)==TCL_ERROR)
+            return TCL_ERROR;
+        ODR_MASK_ZERO (&p->protocolVersion);
+        for (i = 0; i<version; i++)
+            ODR_MASK_SET (&p->protocolVersion, i);
+    }
+    for (i = 4; --i >= 0; )
+        if (ODR_MASK_GET (&p->protocolVersion, i))
+            break;
+    sprintf (buf, "%d", i+1);
+    interp->result = buf;
     return TCL_OK;
 }
 
@@ -510,9 +609,35 @@ static int do_protocolVersion (void *obj, Tcl_Interp *interp,
 static int do_options (void *obj, Tcl_Interp *interp,
                        int argc, char **argv)
 {
-    if (argc == 3)
-        ir_asc2bitmask (argv[2], &((IRObj *) obj)->options);
-    return TCL_OK;
+    static struct ir_named_entry options_tab[] = {
+    { "search", 0 },
+    { "present", 1 },
+    { "delSet", 2 },
+    { "resourceReport", 3 },
+    { "triggerResourceCtrl", 4},
+    { "resourceCtrl", 5},
+    { "accessCtrl", 6},
+    { "scan", 7},
+    { "sort", 8},
+    { "extendedServices", 10},
+    { "level-1Segmentation", 11},
+    { "level-2Segmentation", 12},
+    { "concurrentOperations", 13},
+    { "namedResultSets", 14},
+    { NULL, 0}
+    };
+    IrTcl_Obj *p = obj;
+
+    if (argc <= 0)
+    {
+        ODR_MASK_ZERO (&p->options);
+	ODR_MASK_SET (&p->options, 0);
+	ODR_MASK_SET (&p->options, 1);
+	ODR_MASK_SET (&p->options, 7);
+	ODR_MASK_SET (&p->options, 14);
+	return TCL_OK;
+    }
+    return ir_named_bits (options_tab, &p->options, interp, argc-2, argv+2);
 }
 
 /*
@@ -521,7 +646,13 @@ static int do_options (void *obj, Tcl_Interp *interp,
 static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
-    IRObj *p = obj;
+    IrTcl_Obj *p = obj;
+
+    if (argc <= 0)
+    {
+        p->preferredMessageSize = 30000;
+	return TCL_OK;
+    }
     return get_set_int (&p->preferredMessageSize, interp, argc, argv);
 }
 
@@ -529,12 +660,31 @@ static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
  * do_maximumRecordSize: Set/get maximum record size
  */
 static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
-                                    int argc, char **argv)
+                                 int argc, char **argv)
 {
-    IRObj *p = obj;
+    IrTcl_Obj *p = obj;
+
+    if (argc <= 0)
+    {
+        p->maximumRecordSize = 30000;
+	return TCL_OK;
+    }
     return get_set_int (&p->maximumRecordSize, interp, argc, argv);
 }
 
+/*
+ * do_initResult: Get init result
+ */
+static int do_initResult (void *obj, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+   
+    if (argc <= 0)
+        return TCL_OK;
+    return get_set_int (&p->initResult, interp, argc, argv);
+}
+
 
 /*
  * do_implementationName: Set/get Implementation Name.
@@ -542,33 +692,111 @@ static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
 static int do_implementationName (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+        return ir_strdup (interp, &p->implementationName,
+                          "Index Data/IrTcl on YAZ");
+    else if (argc == -1)
+        return ir_strdel (interp, &p->implementationName);
     if (argc == 3)
     {
-        free (((IRObj*)obj)->implementationName);
-        if (ir_strdup (interp, &((IRObj*) obj)->implementationName, argv[2])
+        free (p->implementationName);
+        if (ir_strdup (interp, &p->implementationName, argv[2])
             == TCL_ERROR)
             return TCL_ERROR;
     }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->implementationName,
-                      (char*) NULL);
+    Tcl_AppendResult (interp, p->implementationName, (char*) NULL);
     return TCL_OK;
 }
 
 /*
- * do_implementationId: Set/get Implementation Id.
+ * do_implementationId: Get Implementation Id.
  */
 static int do_implementationId (void *obj, Tcl_Interp *interp,
                                 int argc, char **argv)
 {
-    if (argc == 3)
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+        return ir_strdup (interp, &p->implementationId, "YAZ (id=81)");
+    else if (argc == -1)
+        return ir_strdel (interp, &p->implementationId);
+    Tcl_AppendResult (interp, p->implementationId, (char*) NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_implementationVersion: get Implementation Version.
+ */
+static int do_implementationVersion (void *obj, Tcl_Interp *interp,
+                                     int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+        return ir_strdup (interp, &p->implementationVersion, 
+                          "YAZ: " YAZ_VERSION " / IrTcl: " IR_TCL_VERSION);
+    else if (argc == -1)
+        return ir_strdel (interp, &p->implementationVersion);
+    Tcl_AppendResult (interp, p->implementationVersion, (char*) NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_targetImplementationName: Get Implementation Name of target.
+ */
+static int do_targetImplementationName (void *obj, Tcl_Interp *interp,
+                                        int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
     {
-        free (((IRObj*)obj)->implementationId);
-        if (ir_strdup (interp, &((IRObj*) obj)->implementationId, argv[2])
-            == TCL_ERROR)
-            return TCL_ERROR;
+        p->targetImplementationName = NULL;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_strdel (interp, &p->targetImplementationName);
+    Tcl_AppendResult (interp, p->targetImplementationName, (char*) NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_targetImplementationId: Get Implementation Id of target
+ */
+static int do_targetImplementationId (void *obj, Tcl_Interp *interp,
+                                      int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+    {
+        p->targetImplementationId = NULL;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_strdel (interp, &p->targetImplementationId);
+    Tcl_AppendResult (interp, p->targetImplementationId, (char*) NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_targetImplementationVersion: Get Implementation Version of target
+ */
+static int do_targetImplementationVersion (void *obj, Tcl_Interp *interp,
+                                           int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+    {
+        p->targetImplementationVersion = NULL;
+	return TCL_OK;
     }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->implementationId,
-                      (char*) NULL);
+    else if (argc == -1)
+        return ir_strdel (interp, &p->targetImplementationVersion);
+    Tcl_AppendResult (interp, p->targetImplementationVersion, (char*) NULL);
     return TCL_OK;
 }
 
@@ -578,15 +806,53 @@ static int do_implementationId (void *obj, Tcl_Interp *interp,
 static int do_idAuthentication (void *obj, Tcl_Interp *interp,
                                 int argc, char **argv)
 {
-    if (argc == 3)
+    IrTcl_Obj *p = obj;
+
+    if (argc >= 3 || argc == -1)
     {
-        free (((IRObj*)obj)->idAuthentication);
-        if (ir_strdup (interp, &((IRObj*) obj)->idAuthentication, argv[2])
-            == TCL_ERROR)
-            return TCL_ERROR;
+        free (p->idAuthenticationOpen);
+        free (p->idAuthenticationGroupId);
+        free (p->idAuthenticationUserId);
+        free (p->idAuthenticationPassword);
+    }
+    if (argc >= 3 || argc <= 0)
+    {
+        p->idAuthenticationOpen = NULL;
+        p->idAuthenticationGroupId = NULL;
+        p->idAuthenticationUserId = NULL;
+        p->idAuthenticationPassword = NULL;
+    }
+    if (argc <= 0)
+        return TCL_OK;
+    if (argc >= 3)
+    {
+        if (argc == 3)
+        {
+            if (ir_strdup (interp, &p->idAuthenticationOpen, argv[2])
+                == TCL_ERROR)
+                return TCL_ERROR;
+        }
+        else if (argc == 5)
+        {
+            if (ir_strdup (interp, &p->idAuthenticationGroupId, argv[2])
+                == TCL_ERROR)
+                return TCL_ERROR;
+            if (ir_strdup (interp, &p->idAuthenticationUserId, argv[3])
+                == TCL_ERROR)
+                return TCL_ERROR;
+            if (ir_strdup (interp, &p->idAuthenticationPassword, argv[4])
+                == TCL_ERROR)
+                return TCL_ERROR;
+        }
+    }
+    if (p->idAuthenticationOpen)
+        Tcl_AppendElement (interp, p->idAuthenticationOpen);
+    else if (p->idAuthenticationGroupId)
+    {
+        Tcl_AppendElement (interp, p->idAuthenticationGroupId);
+        Tcl_AppendElement (interp, p->idAuthenticationUserId);
+        Tcl_AppendElement (interp, p->idAuthenticationPassword);
     }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->idAuthentication,
-                      (char*) NULL);
     return TCL_OK;
 }
 
@@ -597,10 +863,11 @@ static int do_connect (void *obj, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
     void *addr;
-    IRObj *p = obj;
+    IrTcl_Obj *p = obj;
     int r;
-    int protocol_type = CS_Z3950;
 
+    if (argc <= 0)
+        return TCL_OK;
     if (argc == 3)
     {
         if (p->hostname)
@@ -608,50 +875,45 @@ static int do_connect (void *obj, Tcl_Interp *interp,
             interp->result = "already connected";
             return TCL_ERROR;
         }
-        if (!strcmp (p->protocol_type, "Z3950"))
-            protocol_type = CS_Z3950;
-        else if (!strcmp (p->protocol_type, "SR"))
-            protocol_type = CS_SR;
-        else
-        {
-            interp->result = "bad protocol type";
-            return TCL_ERROR;
-        }
         if (!strcmp (p->cs_type, "tcpip"))
         {
-            p->cs_link = cs_create (tcpip_type, CS_BLOCK, protocol_type);
+            p->cs_link = cs_create (tcpip_type, CS_BLOCK, p->protocol_type);
             addr = tcpip_strtoaddr (argv[2]);
             if (!addr)
             {
                 interp->result = "tcpip_strtoaddr fail";
                 return TCL_ERROR;
             }
-            printf ("tcp/ip connect %s\n", argv[2]);
+            logf (LOG_DEBUG, "tcp/ip connect %s", argv[2]);
         }
-#if MOSI
         else if (!strcmp (p->cs_type, "mosi"))
         {
-            p->cs_link = cs_create (mosi_type, CS_BLOCK, protocol_type);
+#if MOSI
+            p->cs_link = cs_create (mosi_type, CS_BLOCK, p->protocol_type);
             addr = mosi_strtoaddr (argv[2]);
             if (!addr)
             {
                 interp->result = "mosi_strtoaddr fail";
                 return TCL_ERROR;
             }
-            printf ("mosi connect %s\n", argv[2]);
-        }
+            logf (LOG_DEBUG, "mosi connect %s", argv[2]);
+#else
+            interp->result = "MOSI support not there";
+            return TCL_ERROR;
 #endif
+        }
         else 
         {
-            interp->result = "unknown comstack type";
+            Tcl_AppendResult (interp, "Bad comstack type: ", 
+                              p->cs_type, NULL);
             return TCL_ERROR;
         }
         if (ir_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
             return TCL_ERROR;
         if ((r=cs_connect (p->cs_link, addr)) < 0)
         {
-            interp->result = "cs_connect fail";
-            do_disconnect (p, NULL, 0, NULL);
+            interp->result = "connect fail";
+            do_disconnect (p, NULL, 2, NULL);
             return TCL_ERROR;
         }
         ir_select_add (cs_fileno (p->cs_link), p);
@@ -664,7 +926,7 @@ static int do_connect (void *obj, Tcl_Interp *interp,
         {
             p->connectFlag = 0;
             if (p->callback)
-                Tcl_Eval (p->interp, p->callback);
+                IrTcl_eval (p->interp, p->callback);
         }
     }
     if (p->hostname)
@@ -678,8 +940,15 @@ static int do_connect (void *obj, Tcl_Interp *interp,
 static int do_disconnect (void *obj, Tcl_Interp *interp,
                           int argc, char **argv)
 {
-    IRObj *p = obj;
+    IrTcl_Obj *p = obj;
 
+    if (argc == 0)
+    {
+        p->connectFlag = 0;
+        p->hostname = NULL;
+	p->cs_link = NULL;
+        return TCL_OK;
+    }
     if (p->hostname)
     {
         free (p->hostname);
@@ -690,6 +959,16 @@ static int do_disconnect (void *obj, Tcl_Interp *interp,
         assert (p->cs_link);
         cs_close (p->cs_link);
         p->cs_link = NULL;
+
+        ODR_MASK_ZERO (&p->options);
+	ODR_MASK_SET (&p->options, 0);
+	ODR_MASK_SET (&p->options, 1);
+	ODR_MASK_SET (&p->options, 7);
+	ODR_MASK_SET (&p->options, 14);
+
+        ODR_MASK_ZERO (&p->protocolVersion);
+	ODR_MASK_SET (&p->protocolVersion, 0);
+	ODR_MASK_SET (&p->protocolVersion, 1);
     }
     assert (!p->cs_link);
     return TCL_OK;
@@ -701,9 +980,13 @@ static int do_disconnect (void *obj, Tcl_Interp *interp,
 static int do_comstack (void *o, Tcl_Interp *interp,
 		        int argc, char **argv)
 {
-    IRObj *obj = o;
+    IrTcl_Obj *obj = o;
 
-    if (argc == 3)
+    if (argc == 0)
+        return ir_strdup (interp, &obj->cs_type, "tcpip");
+    else if (argc == -1)
+        return ir_strdel (interp, &obj->cs_type);
+    else if (argc == 3)
     {
         free (obj->cs_type);
         if (ir_strdup (interp, &obj->cs_type, argv[2]) == TCL_ERROR)
@@ -713,56 +996,100 @@ static int do_comstack (void *o, Tcl_Interp *interp,
     return TCL_OK;
 }
 
+
 /*
- * do_protocol: Set/get protocol method on IR object
+ * do_callback: add callback
  */
-static int do_protocol (void *o, Tcl_Interp *interp,
-		        int argc, char **argv)
+static int do_callback (void *obj, Tcl_Interp *interp,
+                          int argc, char **argv)
 {
-    IRObj *obj = o;
+    IrTcl_Obj *p = obj;
 
+    if (argc == 0)
+    {
+        p->callback = NULL;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_strdel (interp, &p->callback);
     if (argc == 3)
     {
-        free (obj->protocol_type);
-        if (ir_strdup (interp, &obj->protocol_type, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
+        free (p->callback);
+	if (argv[2][0])
+	{
+            if (ir_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)
+                return TCL_ERROR;
+	}
+	else
+	    p->callback = NULL;
+        p->interp = irTcl_interp;
     }
-    Tcl_AppendElement (interp, obj->protocol_type);
     return TCL_OK;
 }
 
 /*
- * do_callback: add callback
+ * do_failback: add error handle callback
  */
-static int do_callback (void *obj, Tcl_Interp *interp,
+static int do_failback (void *obj, Tcl_Interp *interp,
                           int argc, char **argv)
 {
-    IRObj *p = obj;
+    IrTcl_Obj *p = obj;
 
-    if (argc == 3)
+    if (argc == 0)
     {
-        free (p->callback);
-        if (ir_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-        p->interp = interp;
+        p->failback = NULL;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_strdel (interp, &p->failback);
+    else if (argc == 3)
+    {
+        free (p->failback);
+	if (argv[2][0])
+	{
+            if (ir_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
+                return TCL_ERROR;
+	}
+	else
+	    p->failback = NULL;
+        p->interp = irTcl_interp;
     }
     return TCL_OK;
 }
 
 /*
- * do_failback: add error handle callback
+ * do_protocol: Set/get protocol method on IR object
  */
-static int do_failback (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
+static int do_protocol (void *o, Tcl_Interp *interp, int argc, char **argv)
 {
-    IRObj *p = obj;
+    IrTcl_Obj *p = o;
 
-    if (argc == 3)
+    if (argc <= 0)
     {
-        free (p->failback);
-        if (ir_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
+        p->protocol_type = PROTO_Z3950;
+        return TCL_OK;
+    }
+    else if (argc == 3)
+    {
+        if (!strcmp (argv[2], "Z39"))
+            p->protocol_type = PROTO_Z3950;
+        else if (!strcmp (argv[2], "SR"))
+            p->protocol_type = PROTO_SR;
+        else
+        {
+            Tcl_AppendResult (interp, "Bad protocol: ", argv[2], NULL);
             return TCL_ERROR;
-        p->interp = interp;
+        }
+        return TCL_OK;
+    }
+    switch (p->protocol_type)
+    {
+    case PROTO_Z3950:
+        Tcl_AppendElement (interp, "Z39");
+        break;
+    case PROTO_SR:
+        Tcl_AppendElement (interp, "SR");
+        break;
     }
     return TCL_OK;
 }
@@ -771,11 +1098,23 @@ static int do_failback (void *obj, Tcl_Interp *interp,
  * do_databaseNames: specify database names
  */
 static int do_databaseNames (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
+                             int argc, char **argv)
 {
     int i;
-    IRObj *p = obj;
+    IrTcl_SetCObj *p = obj;
 
+    if (argc == -1)
+    {
+        for (i=0; i<p->num_databaseNames; i++)
+            free (p->databaseNames[i]);
+        free (p->databaseNames);
+    }
+    if (argc <= 0)
+    {
+        p->num_databaseNames = 0;
+	p->databaseNames = NULL;
+	return TCL_OK;
+    }
     if (argc < 3)
     {
         for (i=0; i<p->num_databaseNames; i++)
@@ -802,61 +1141,221 @@ static int do_databaseNames (void *obj, Tcl_Interp *interp,
 }
 
 /*
- * do_query: Set/Get query mothod
+ * do_replaceIndicator: Set/get replace Set indicator
  */
-static int do_query (void *obj, Tcl_Interp *interp,
+static int do_replaceIndicator (void *obj, Tcl_Interp *interp,
+                                int argc, char **argv)
+{
+    IrTcl_SetCObj *p = obj;
+
+    if (argc <= 0)
+    {
+        p->replaceIndicator = 1;
+	return TCL_OK;
+    }
+    return get_set_int (&p->replaceIndicator, interp, argc, argv);
+}
+
+/*
+ * do_queryType: Set/Get query method
+ */
+static int do_queryType (void *obj, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
-    IRObj *p = obj;
+    IrTcl_SetCObj *p = obj;
+
+    if (argc == 0)
+        return ir_strdup (interp, &p->queryType, "rpn");
+    else if (argc == -1)
+        return ir_strdel (interp, &p->queryType);
     if (argc == 3)
     {
-        free (p->query_method);
-        if (ir_strdup (interp, &p->query_method, argv[2]) == TCL_ERROR)
+        free (p->queryType);
+        if (ir_strdup (interp, &p->queryType, argv[2]) == TCL_ERROR)
             return TCL_ERROR;
     }
-    Tcl_AppendResult (interp, p->query_method, NULL);
+    Tcl_AppendResult (interp, p->queryType, NULL);
     return TCL_OK;
 }
 
 /*
- * do_replaceIndicator: Set/get replace Set indicator
+ * do_userInformationField: Get User information field
  */
-static int do_replaceIndicator (void *obj, Tcl_Interp *interp,
-                                int argc, char **argv)
+static int do_userInformationField (void *obj, Tcl_Interp *interp,
+                                    int argc, char **argv)
 {
-    IRObj *p = obj;
-    return get_set_int (&p->replaceIndicator, interp, argc, argv);
+    IrTcl_Obj *p = obj;
+    
+    if (argc == 0)
+    {
+        p->userInformationField = NULL;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_strdel (interp, &p->userInformationField);
+    Tcl_AppendResult (interp, p->userInformationField, NULL);
+    return TCL_OK;
 }
 
+/*
+ * do_smallSetUpperBound: Set/get small set upper bound
+ */
+static int do_smallSetUpperBound (void *o, Tcl_Interp *interp,
+		       int argc, char **argv)
+{
+    IrTcl_SetCObj *p = o;
+
+    if (argc <= 0)
+    {
+        p->smallSetUpperBound = 0;
+	return TCL_OK;
+    }
+    return get_set_int (&p->smallSetUpperBound, interp, argc, argv);
+}
+
+/*
+ * do_largeSetLowerBound: Set/get large set lower bound
+ */
+static int do_largeSetLowerBound (void *o, Tcl_Interp *interp,
+                                  int argc, char **argv)
+{
+    IrTcl_SetCObj *p = o;
+
+    if (argc <= 0)
+    {
+        p->largeSetLowerBound = 2;
+	return TCL_OK;
+    }
+    return get_set_int (&p->largeSetLowerBound, interp, argc, argv);
+}
+
+/*
+ * do_mediumSetPresentNumber: Set/get large set lower bound
+ */
+static int do_mediumSetPresentNumber (void *o, Tcl_Interp *interp,
+                                      int argc, char **argv)
+{
+    IrTcl_SetCObj *p = o;
+   
+    if (argc <= 0)
+    {
+        p->mediumSetPresentNumber = 0;
+	return TCL_OK;
+    }
+    return get_set_int (&p->mediumSetPresentNumber, interp, argc, argv);
+}
+
+/*
+ * do_referenceId: Set/Get referenceId
+ */
+static int do_referenceId (void *obj, Tcl_Interp *interp,
+		           int argc, char **argv)
+{
+    IrTcl_SetCObj *p = obj;
+
+    if (argc == 0)
+    {
+        p->referenceId = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_strdel (interp, &p->referenceId);
+    if (argc == 3)
+    {
+        free (p->referenceId);
+        if (ir_strdup (interp, &p->referenceId, argv[2]) == TCL_ERROR)
+            return TCL_ERROR;
+    }
+    Tcl_AppendResult (interp, p->referenceId, NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_preferredRecordSyntax: Set/get preferred record syntax
+ */
+static int do_preferredRecordSyntax (void *obj, Tcl_Interp *interp,
+                                     int argc, char **argv)
+{
+    IrTcl_SetCObj *p = obj;
+
+    if (argc == 0)
+    {
+        p->preferredRecordSyntax = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+    {
+        free (p->preferredRecordSyntax);
+        p->preferredRecordSyntax = NULL;
+        return TCL_OK;
+    }
+    if (argc == 3)
+    {
+        free (p->preferredRecordSyntax);
+        p->preferredRecordSyntax = NULL;
+        if (argv[2][0] && (p->preferredRecordSyntax = 
+                           malloc (sizeof(*p->preferredRecordSyntax))))
+            *p->preferredRecordSyntax = IrTcl_getRecordSyntaxVal (argv[2]);
+    }
+    return TCL_OK;
+            
+}
+static IrTcl_Method ir_method_tab[] = {
+{ 1, "comstack",                    do_comstack },
+{ 1, "protocol",                    do_protocol },
+{ 0, "failback",                    do_failback },
+
+{ 1, "connect",                     do_connect },
+{ 0, "protocolVersion",             do_protocolVersion },
+{ 1, "preferredMessageSize",        do_preferredMessageSize },
+{ 1, "maximumRecordSize",           do_maximumRecordSize },
+{ 1, "implementationName",          do_implementationName },
+{ 1, "implementationId",            do_implementationId },
+{ 1, "implementationVersion",       do_implementationVersion },
+{ 0, "targetImplementationName",    do_targetImplementationName },
+{ 0, "targetImplementationId",      do_targetImplementationId },
+{ 0, "targetImplementationVersion", do_targetImplementationVersion },
+{ 0, "userInformationField",        do_userInformationField },
+{ 1, "idAuthentication",            do_idAuthentication },
+{ 0, "options",                     do_options },
+{ 0, "init",                        do_init_request },
+{ 0, "initResult",                  do_initResult },
+{ 0, "disconnect",                  do_disconnect },
+{ 0, "callback",                    do_callback },
+{ 0, NULL, NULL}
+};
+
+static IrTcl_Method ir_set_c_method_tab[] = {
+{ 0, "databaseNames",               do_databaseNames},
+{ 0, "replaceIndicator",            do_replaceIndicator},
+{ 0, "queryType",                   do_queryType },
+{ 0, "preferredRecordSyntax",       do_preferredRecordSyntax },
+{ 0, "smallSetUpperBound",          do_smallSetUpperBound},
+{ 0, "largeSetLowerBound",          do_largeSetLowerBound},
+{ 0, "mediumSetPresentNumber",      do_mediumSetPresentNumber},
+{ 0, "referenceId",                 do_referenceId },
+{ 0, NULL, NULL}
+};
+
 /* 
  * ir_obj_method: IR Object methods
  */
 static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
                           int argc, char **argv)
 {
-    static IRMethod tab[] = {
-    { 1, "comstack",                do_comstack },
-    { 1, "protocol",                do_protocol },
-    { 1, "connect",                 do_connect },
-    { 0, "protocolVersion",         do_protocolVersion },
-    { 0, "options",                 do_options },
-    { 1, "preferredMessageSize",    do_preferredMessageSize },
-    { 1, "maximumRecordSize",       do_maximumRecordSize },
-    { 1, "implementationName",      do_implementationName },
-    { 1, "implementationId",        do_implementationId },
-    { 1, "idAuthentication",        do_idAuthentication },
-    { 0, "init",                    do_init_request },
-    { 0, "disconnect",              do_disconnect },
-    { 0, "callback",                do_callback },
-    { 0, "failback",                do_failback },
-    { 1, "databaseNames",           do_databaseNames},
-    { 1, "replaceIndicator",        do_replaceIndicator},
-    { 1, "query",                   do_query },
-    { 0, NULL, NULL}
-    };
+    IrTcl_Methods tab[3];
+    IrTcl_Obj *p = clientData;
+
     if (argc < 2)
-        return ir_method_r (clientData, interp, argc, argv, tab);
-    return ir_method (clientData, interp, argc, argv, tab);
+        return ir_method_r (clientData, interp, argc, argv, ir_method_tab);
+
+    tab[0].tab = ir_method_tab;
+    tab[0].obj = p;
+    tab[1].tab = ir_set_c_method_tab;
+    tab[1].obj = &p->set_inher;
+    tab[2].tab = NULL;
+
+    return ir_method (interp, argc, argv, tab);
 }
 
 /* 
@@ -864,17 +1363,40 @@ static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
  */
 static void ir_obj_delete (ClientData clientData)
 {
-    free ( (void*) clientData);
+    IrTcl_Obj *obj = clientData;
+    IrTcl_Methods tab[3];
+
+    --(obj->ref_count);
+    if (obj->ref_count > 0)
+        return;
+    assert (obj->ref_count == 0);
+
+    tab[0].tab = ir_method_tab;
+    tab[0].obj = obj;
+    tab[1].tab = ir_set_c_method_tab;
+    tab[1].obj = &obj->set_inher;
+    tab[2].tab = NULL;
+
+    ir_method (NULL, -1, NULL, tab);
+    odr_destroy (obj->odr_in);
+    odr_destroy (obj->odr_out);
+    odr_destroy (obj->odr_pr);
+    free (obj->buf_out);
+    free (obj->buf_in);
+    free (obj);
 }
 
 /* 
  * ir_obj_mk: IR Object creation
  */
 static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
-              int argc, char **argv)
+                      int argc, char **argv)
 {
-    IRObj *obj;
+    IrTcl_Methods tab[3];
+    IrTcl_Obj *obj;
+#if CCL2RPN
     FILE *inf;
+#endif
 
     if (argc != 2)
     {
@@ -883,61 +1405,16 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     }
     if (!(obj = ir_malloc (interp, sizeof(*obj))))
         return TCL_ERROR;
-    if (ir_strdup (interp, &obj->cs_type, "tcpip") == TCL_ERROR)
-        return TCL_ERROR;
-    if (ir_strdup (interp, &obj->protocol_type, "Z3950") == TCL_ERROR)
-        return TCL_ERROR;
-    obj->cs_link = NULL;
-    obj->bib1.proto = PROTO_Z3950;
-    obj->bib1.class = CLASS_ATTSET;
-    obj->bib1.value = VAL_BIB1;
-
-    obj->maximumRecordSize = 32768;
-    obj->preferredMessageSize = 4096;
-    obj->connectFlag = 0;
-
-    obj->idAuthentication = NULL;
-
-    if (ir_strdup (interp, &obj->implementationName, "TCL/TK on YAZ")
-        == TCL_ERROR)
-        return TCL_ERROR;
-
-    if (ir_strdup (interp, &obj->implementationId, "TCL/TK/YAZ")
-        == TCL_ERROR)
-        return TCL_ERROR;
-    
-    obj->smallSetUpperBound = 0;
-    obj->largeSetLowerBound = 2;
-    obj->mediumSetPresentNumber = 0;
-    obj->replaceIndicator = 1;
-#if 0
-    obj->databaseNames = NULL;
-    obj->num_databaseNames = 0; 
-#else
-    obj->num_databaseNames = 1;
-    if (!(obj->databaseNames = ir_malloc (interp,
-                                          sizeof(*obj->databaseNames))))
-        return TCL_ERROR;
-    if (ir_strdup (interp, &obj->databaseNames[0], "Default") == TCL_ERROR)
-        return TCL_ERROR;
-#endif
-
-    obj->hostname = NULL;
 
-    if (ir_strdup (interp, &obj->query_method, "rpn") == TCL_ERROR)
-        return TCL_ERROR;
+    obj->ref_count = 1;
+#if CCL2RPN
     obj->bibset = ccl_qual_mk (); 
     if ((inf = fopen ("default.bib", "r")))
     {
     	ccl_qual_file (obj->bibset, inf);
     	fclose (inf);
     }
-    ODR_MASK_ZERO (&obj->protocolVersion);
-    ODR_MASK_SET (&obj->protocolVersion, 0);
-    ODR_MASK_SET (&obj->protocolVersion, 1);
-
-    ODR_MASK_ZERO (&obj->options);
-    ODR_MASK_SET (&obj->options, 0);
+#endif
 
     obj->odr_in = odr_createmem (ODR_DECODE);
     obj->odr_out = odr_createmem (ODR_ENCODE);
@@ -946,13 +1423,19 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     obj->len_out = 10000;
     if (!(obj->buf_out = ir_malloc (interp, obj->len_out)))
         return TCL_ERROR;
-    odr_setbuf (obj->odr_out, obj->buf_out, obj->len_out);
+    odr_setbuf (obj->odr_out, obj->buf_out, obj->len_out, 0);
 
     obj->len_in = 0;
     obj->buf_in = NULL;
 
-    obj->callback = NULL;
-    obj->failback = NULL;
+    tab[0].tab = ir_method_tab;
+    tab[0].obj = obj;
+    tab[1].tab = ir_set_c_method_tab;
+    tab[1].obj = &obj->set_inher;
+    tab[2].tab = NULL;
+
+    if (ir_method (interp, 0, NULL, tab) == TCL_ERROR)
+        return TCL_ERROR;
     Tcl_CreateCommand (interp, argv[1], ir_obj_method,
                        (ClientData) obj, ir_obj_delete);
     return TCL_OK;
@@ -962,16 +1445,19 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
 /*
  * do_search: Do search request
  */
-static int do_search (void *o, Tcl_Interp *interp,
-		       int argc, char **argv)
+static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
 {
-    Z_SearchRequest req;
+    Z_SearchRequest *req;
     Z_Query query;
-    Z_APDU apdu, *apdup = &apdu;
+    Z_APDU *apdu;
     Odr_oct ccl_query;
-    IRSetObj *obj = o;
-    IRObj *p = obj->parent;
+    IrTcl_SetObj *obj = o;
+    IrTcl_Obj *p = obj->parent;
     int r;
+    oident bib1;
+
+    if (argc <= 0)
+        return TCL_OK;
 
     p->set_child = o;
     if (argc != 3)
@@ -979,7 +1465,7 @@ static int do_search (void *o, Tcl_Interp *interp,
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    if (!p->num_databaseNames)
+    if (!obj->set_inher.num_databaseNames)
     {
         interp->result = "no databaseNames";
         return TCL_ERROR;
@@ -989,28 +1475,60 @@ static int do_search (void *o, Tcl_Interp *interp,
         interp->result = "not connected";
         return TCL_ERROR;
     }
-    apdu.which = Z_APDU_searchRequest;
-    apdu.u.searchRequest = &req;
+    odr_reset (p->odr_out);
+    apdu = zget_APDU (p->odr_out, Z_APDU_searchRequest);
+    req = apdu->u.searchRequest;
+
+    bib1.proto = p->protocol_type;
+    bib1.class = CLASS_ATTSET;
+    bib1.value = VAL_BIB1;
+
+    set_referenceId (p->odr_out, &req->referenceId,
+                     obj->set_inher.referenceId);
+
+    req->smallSetUpperBound = &obj->set_inher.smallSetUpperBound;
+    req->largeSetLowerBound = &obj->set_inher.largeSetLowerBound;
+    req->mediumSetPresentNumber = &obj->set_inher.mediumSetPresentNumber;
+    req->replaceIndicator = &obj->set_inher.replaceIndicator;
+    req->resultSetName = obj->setName ? obj->setName : "Default";
+    logf (LOG_DEBUG, "Search, resultSetName %s", req->resultSetName);
+    req->num_databaseNames = obj->set_inher.num_databaseNames;
+    req->databaseNames = obj->set_inher.databaseNames;
+    for (r=0; r < obj->set_inher.num_databaseNames; r++)
+        logf (LOG_DEBUG, " Database %s", obj->set_inher.databaseNames[r]);
+    req->smallSetElementSetNames = 0;
+    req->mediumSetElementSetNames = 0;
+    if (obj->set_inher.preferredRecordSyntax)
+    {
+        struct oident ident;
+
+        ident.proto = p->protocol_type;
+        ident.class = CLASS_RECSYN;
+        ident.value = *obj->set_inher.preferredRecordSyntax;
+        req->preferredRecordSyntax = odr_oiddup (p->odr_out, 
+                                                 oid_getoidbyent (&ident));
+    }
+    else
+        req->preferredRecordSyntax = 0;
+    req->query = &query;
 
-    req.referenceId = 0;
-    req.smallSetUpperBound = &p->smallSetUpperBound;
-    req.largeSetLowerBound = &p->largeSetLowerBound;
-    req.mediumSetPresentNumber = &p->mediumSetPresentNumber;
-    req.replaceIndicator = &p->replaceIndicator;
-    req.resultSetName = obj->setName ? obj->setName : "Default";
-    req.num_databaseNames = p->num_databaseNames;
-    req.databaseNames = p->databaseNames;
-    printf ("Search:");
-    for (r=0; r<p->num_databaseNames; r++)
+    if (!strcmp (obj->set_inher.queryType, "rpn"))
     {
-        printf (" %s", p->databaseNames[r]);
-    }
-    req.smallSetElementSetNames = 0;
-    req.mediumSetElementSetNames = 0;
-    req.preferredRecordSyntax = 0;
-    req.query = &query;
+        Z_RPNQuery *RPNquery;
 
-    if (!strcmp (p->query_method, "rpn"))
+        RPNquery = p_query_rpn (p->odr_out, argv[2]);
+	if (!RPNquery)
+	{
+            Tcl_AppendResult (interp, "Syntax error in query", NULL);
+            return TCL_ERROR;
+        }
+        RPNquery->attributeSetId = oid_getoidbyent (&bib1);
+        query.which = Z_Query_type_1;
+        query.u.type_1 = RPNquery;
+        logf (LOG_DEBUG, "RPN");
+    }
+#if CCL2RPN
+    else if (!strcmp (obj->set_inher.queryType, "cclrpn"))
     {
         int error;
         int pos;
@@ -1020,35 +1538,39 @@ static int do_search (void *o, Tcl_Interp *interp,
         rpn = ccl_find_str(p->bibset, argv[2], &error, &pos);
         if (error)
         {
-            Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg(error),NULL);
+            Tcl_AppendResult (interp, "CCL error: ", 
+	                      ccl_err_msg(error), NULL);
             return TCL_ERROR;
         }
-        query.which = Z_Query_type_1;
+        ccl_pr_tree (rpn, stderr);
+        fprintf (stderr, "\n");
         assert((RPNquery = ccl_rpn_query(rpn)));
-        RPNquery->attributeSetId = oid_getoidbyent (&p->bib1);
+        RPNquery->attributeSetId = oid_getoidbyent (&bib1);
+        query.which = Z_Query_type_1;
         query.u.type_1 = RPNquery;
-        printf ("- RPN\n");
+        logf (LOG_DEBUG, "CCLRPN");
     }
-    else if (!strcmp (p->query_method, "ccl"))
+#endif
+    else if (!strcmp (obj->set_inher.queryType, "ccl"))
     {
         query.which = Z_Query_type_2;
         query.u.type_2 = &ccl_query;
         ccl_query.buf = (unsigned char *) argv[2];
         ccl_query.len = strlen (argv[2]);
-        printf ("- CCL\n");
+        logf (LOG_DEBUG, "CCL");
     }
     else
     {
         interp->result = "unknown query method";
         return TCL_ERROR;
     }
-    if (!z_APDU (p->odr_out, &apdup, 0))
+    if (!z_APDU (p->odr_out, &apdu, 0))
     {
         interp->result = odr_errlist [odr_geterror (p->odr_out)];
         odr_reset (p->odr_out);
         return TCL_ERROR;
     } 
-    p->sbuf = odr_getbuf (p->odr_out, &p->slen);
+    p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
     if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
     {
         interp->result = "cs_put failed in search";
@@ -1057,11 +1579,11 @@ static int do_search (void *o, Tcl_Interp *interp,
     else if (r == 1)
     {
         ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf("Sent part of searchRequest (%d bytes).\n", p->slen);
+        logf (LOG_DEBUG, "Sent part of searchRequest (%d bytes)", p->slen);
     }
     else
     {
-        printf ("Whole search request\n");
+        logf (LOG_DEBUG, "Whole search request (%d bytes)", p->slen);
     }
     return TCL_OK;
 }
@@ -1072,20 +1594,51 @@ static int do_search (void *o, Tcl_Interp *interp,
 static int do_resultCount (void *o, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
 
+    if (argc <= 0)
+        return TCL_OK;
     return get_set_int (&obj->resultCount, interp, argc, argv);
 }
 
 /*
- * do_searchStatus: Get search status (after search response)
+ * do_searchStatus: Get search status (after search response)
+ */
+static int do_searchStatus (void *o, Tcl_Interp *interp,
+		            int argc, char **argv)
+{
+    IrTcl_SetObj *obj = o;
+
+    if (argc <= 0)
+        return TCL_OK;
+    return get_set_int (&obj->searchStatus, interp, argc, argv);
+}
+
+/*
+ * do_presentStatus: Get search status (after search/present response)
+ */
+static int do_presentStatus (void *o, Tcl_Interp *interp,
+		            int argc, char **argv)
+{
+    IrTcl_SetObj *obj = o;
+
+    if (argc <= 0)
+        return TCL_OK;
+    return get_set_int (&obj->presentStatus, interp, argc, argv);
+}
+
+/*
+ * do_nextResultSetPosition: Get next result set position
+ *       (after search/present response)
  */
-static int do_searchStatus (void *o, Tcl_Interp *interp,
-		            int argc, char **argv)
+static int do_nextResultSetPosition (void *o, Tcl_Interp *interp,
+                                     int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
 
-    return get_set_int (&obj->searchStatus, interp, argc, argv);
+    if (argc <= 0)
+        return TCL_OK;
+    return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);
 }
 
 /*
@@ -1094,8 +1647,12 @@ static int do_searchStatus (void *o, Tcl_Interp *interp,
 static int do_setName (void *o, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
 
+    if (argc == 0)
+        return ir_strdup (interp, &obj->setName, "Default");
+    else if (argc == -1)
+        return ir_strdel (interp, &obj->setName);
     if (argc == 3)
     {
         free (obj->setName);
@@ -1111,85 +1668,77 @@ static int do_setName (void *o, Tcl_Interp *interp,
  * do_numberOfRecordsReturned: Get number of records returned
  */
 static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
-		       int argc, char **argv)
+                                       int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
 
+    if (argc <= 0)
+    {
+        obj->numberOfRecordsReturned = 0;
+        return TCL_OK;
+    }
     return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
 }
 
-static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
-                           int argc, char **argv)
+/*
+ * do_type: Return type (if any) at position.
+ */
+static int do_type (void *o, Tcl_Interp *interp, int argc, char **argv)
 {
-    Iso2709Anchor a;
-    char *data;
+    IrTcl_SetObj *obj = o;
+    int offset;
+    IrTcl_RecordList *rl;
 
-    if (!rec)
-        return TCL_OK;
-    a = iso2709_a_mk (rec);
-    while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
+    if (argc == 0)
     {
-        if (!(iso2709_a_info_field (a, NULL, NULL, NULL, &data)))
-            break;
-        Tcl_AppendElement (interp, data);
-        iso2709_a_next (a);
+        obj->record_list = NULL;
+	return TCL_OK;
     }
-
-    iso2709_a_rm (a);
-    return TCL_OK;
-}
-
-static int get_marc_lines(Tcl_Interp *interp, Iso2709Rec rec,
-                         int argc, char **argv)
-{
-    Iso2709Anchor a;
-    char *tag;
-    char *indicator;
-    char *identifier;
-    char *data;
-    char *ptag = "";
-    
-    if (!rec)
+    else if (argc == -1)
+    {
+        delete_IR_records (obj);
+	return TCL_OK;
+    }
+    if (argc < 3)
+    {
+        sprintf (interp->result, "wrong # args");
+        return TCL_ERROR;
+    }
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
+        return TCL_ERROR;
+    rl = find_IR_record (obj, offset);
+    if (!rl)
         return TCL_OK;
-    a = iso2709_a_mk (rec);
-    while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
+    switch (rl->which)
     {
-        if (!(iso2709_a_info_field (a, &tag, &indicator, &identifier, &data)))
-            break;
-        if (strcmp (tag, ptag))
-        {
-            if (*ptag)
-                Tcl_AppendResult (interp, "}} ", NULL);
-            if (!indicator)
-                Tcl_AppendResult (interp, "{", tag, " {} {", NULL);
-            else
-                Tcl_AppendResult (interp, "{", tag, " {", indicator, 
-                                  "} {", NULL);
-            ptag = tag;
-        }
-        if (!identifier)
-            Tcl_AppendResult (interp, "{{}", NULL);
-        else
-            Tcl_AppendResult (interp, "{", identifier, NULL);
-        Tcl_AppendElement (interp, data);
-        Tcl_AppendResult (interp, "} ", NULL);
-        iso2709_a_next (a);
-    }
-    if (*ptag)
-        Tcl_AppendResult (interp, "}} ", NULL);
-    iso2709_a_rm (a);
+    case Z_NamePlusRecord_databaseRecord:
+        interp->result = "DB";
+        break;
+    case Z_NamePlusRecord_surrogateDiagnostic:
+        interp->result = "SD";
+        break;
+    }
     return TCL_OK;
 }
 
+
 /*
  * do_recordType: Return record type (if any) at position.
  */
 static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
     int offset;
-    IRRecordList *rl;
+    IrTcl_RecordList *rl;
 
+    if (argc == 0)
+    {
+	return TCL_OK;
+    }
+    else if (argc == -1)
+    {
+	return TCL_OK;
+    }
     if (argc < 3)
     {
         sprintf (interp->result, "wrong # args");
@@ -1200,28 +1749,54 @@ static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
     rl = find_IR_record (obj, offset);
     if (!rl)
         return TCL_OK;
-    switch (rl->which)
+    if (rl->which != Z_NamePlusRecord_databaseRecord)
     {
-    case Z_NamePlusRecord_databaseRecord:
-        interp->result = "databaseRecord";
-        break;
-    case Z_NamePlusRecord_surrogateDiagnostic:
-        interp->result = "surrogateDiagnostic";
-        break;
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
+        return TCL_ERROR;
     }
+    Tcl_AppendElement (interp, (char*)
+                       IrTcl_getRecordSyntaxStr (rl->u.dbrec.type));
     return TCL_OK;
 }
 
 /*
- * do_recordDiag: Return diagnostic record info
+ * ir_diagResult 
  */
-static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int ir_diagResult (Tcl_Interp *interp, IrTcl_Diagnostic *list, int num)
 {
-    IRSetObj *obj = o;
-    int offset;
-    IRRecordList *rl;
     char buf[20];
+    int i;
+    const char *cp;
+
+    for (i = 0; i<num; i++)
+    {
+        logf (LOG_DEBUG, "Diagnostic, code %d", list[i].condition);
+        sprintf (buf, "%d", list[i].condition);
+        Tcl_AppendElement (interp, buf);
+        cp = diagbib1_str (list[i].condition);
+        if (cp)
+            Tcl_AppendElement (interp, (char*) cp);
+        else
+            Tcl_AppendElement (interp, "");
+        if (list[i].addinfo)
+            Tcl_AppendElement (interp, (char*) list[i].addinfo);
+        else
+            Tcl_AppendElement (interp, "");
+    }
+    return TCL_OK;
+}
+
+/*
+ * do_diag: Return diagnostic record info
+ */
+static int do_diag (void *o, Tcl_Interp *interp, int argc, char **argv)
+{
+    IrTcl_SetObj *obj = o;
+    int offset;
+    IrTcl_RecordList *rl;
 
+    if (argc <= 0)
+        return TCL_OK;
     if (argc < 3)
     {
         sprintf (interp->result, "wrong # args");
@@ -1240,23 +1815,22 @@ static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
         Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
         return TCL_ERROR;
     }
-    sprintf (buf, "%d", rl->u.diag.condition);
-    Tcl_AppendResult (interp, buf, " {", 
-                      (rl->u.diag.addinfo ? rl->u.diag.addinfo : ""),
-                      "}", NULL);
-    return TCL_OK;
+    return ir_diagResult (interp, rl->u.surrogateDiagnostics.list,
+                          rl->u.surrogateDiagnostics.num);
 }
 
 /*
- * do_recordMarc: Get ISO2709 Record lines/fields
+ * do_getMarc: Get ISO2709 Record lines/fields
  */
-static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_getMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
     int offset;
-    IRRecordList *rl;
+    IrTcl_RecordList *rl;
 
-    if (argc < 4)
+    if (argc <= 0)
+        return TCL_OK;
+    if (argc < 7)
     {
         sprintf (interp->result, "wrong # args");
         return TCL_ERROR;
@@ -1271,18 +1845,10 @@ static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
     if (rl->which != Z_NamePlusRecord_databaseRecord)
     {
-        Tcl_AppendResult (interp, "No MARC record at #", argv[2], NULL);
-        return TCL_ERROR;
-    }
-    if (!strcmp (argv[3], "field"))
-        return get_marc_fields (interp, rl->u.marc.rec, argc, argv);
-    else if (!strcmp (argv[3], "line"))
-        return get_marc_lines (interp, rl->u.marc.rec, argc, argv);
-    else
-    {
-        Tcl_AppendResult (interp, "field/line expected", NULL);
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
         return TCL_ERROR;
     }
+    return ir_tcl_get_marc (interp, rl->u.dbrec.buf, argc, argv);
 }
 
 
@@ -1292,18 +1858,35 @@ static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
 static int do_responseStatus (void *o, Tcl_Interp *interp, 
                              int argc, char **argv)
 {
-    IRSetObj *obj = o;
+    IrTcl_SetObj *obj = o;
 
+    if (argc == 0)
+    {
+        obj->recordFlag = 0;
+        obj->nonSurrogateDiagnosticNum = 0;
+        obj->nonSurrogateDiagnosticList = NULL;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+    {
+        ir_deleteDiags (&obj->nonSurrogateDiagnosticList,
+                        &obj->nonSurrogateDiagnosticNum);
+        return TCL_OK;
+    }
     if (!obj->recordFlag)
+    {
+        Tcl_AppendElement (interp, "OK");
         return TCL_OK;
+    }
     switch (obj->which)
     {
     case Z_Records_DBOSD:
     	Tcl_AppendElement (interp, "DBOSD");
         break;
     case Z_Records_NSD:
-        return mk_nonSurrogateDiagnostics (interp, obj->condition, 
-	                                   obj->addinfo);
+        Tcl_AppendElement (interp, "NSD");
+        return ir_diagResult (interp, obj->nonSurrogateDiagnosticList,
+                              obj->nonSurrogateDiagnosticNum);
     }
     return TCL_OK;
 }
@@ -1315,14 +1898,16 @@ static int do_responseStatus (void *o, Tcl_Interp *interp,
 static int do_present (void *o, Tcl_Interp *interp,
                        int argc, char **argv)
 {
-    IRSetObj *obj = o;
-    IRObj *p = obj->parent;
-    Z_APDU apdu, *apdup = &apdu;
-    Z_PresentRequest req;
+    IrTcl_SetObj *obj = o;
+    IrTcl_Obj *p = obj->parent;
+    Z_APDU *apdu;
+    Z_PresentRequest *req;
     int start;
     int number;
     int r;
 
+    if (argc <= 0)
+        return TCL_OK;
     if (argc >= 3)
     {
         if (Tcl_GetInt (interp, argv[2], &start) == TCL_ERROR)
@@ -1342,28 +1927,29 @@ static int do_present (void *o, Tcl_Interp *interp,
         interp->result = "not connected";
         return TCL_ERROR;
     }
+    odr_reset (p->odr_out);
     obj->start = start;
     obj->number = number;
 
-    apdu.which = Z_APDU_presentRequest;
-    apdu.u.presentRequest = &req;
-    req.referenceId = 0;
-    /* sprintf(setstring, "%d", setnumber); */
+    apdu = zget_APDU (p->odr_out, Z_APDU_presentRequest);
+    req = apdu->u.presentRequest;
 
-    req.resultSetId = obj->setName ? obj->setName : "Default";
+    set_referenceId (p->odr_out, &req->referenceId,
+                     obj->set_inher.referenceId);
+
+    req->resultSetId = obj->setName ? obj->setName : "Default";
     
-    req.resultSetStartPoint = &start;
-    req.numberOfRecordsRequested = &number;
-    req.elementSetNames = 0;
-    req.preferredRecordSyntax = 0;
+    req->resultSetStartPoint = &start;
+    req->numberOfRecordsRequested = &number;
+    req->preferredRecordSyntax = 0;
 
-    if (!z_APDU (p->odr_out, &apdup, 0))
+    if (!z_APDU (p->odr_out, &apdu, 0))
     {
         interp->result = odr_errlist [odr_geterror (p->odr_out)];
         odr_reset (p->odr_out);
         return TCL_ERROR;
     } 
-    p->sbuf = odr_getbuf (p->odr_out, &p->slen);
+    p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
     if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
     {
         interp->result = "cs_put failed in present";
@@ -1372,13 +1958,13 @@ static int do_present (void *o, Tcl_Interp *interp,
     else if (r == 1)
     {
         ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf ("Part of present request, start=%d, num=%d (%d bytes)\n",
-                start, number, p->slen);
+        logf (LOG_DEBUG, "Part of present request, start=%d, num=%d" 
+              " (%d bytes)", start, number, p->slen);
     }
     else
     {
-        printf ("Whole present request, start=%d, num=%d (%d bytes)\n",
-                start, number, p->slen);
+        logf (LOG_DEBUG, "Whole present request, start=%d, num=%d"
+              " (%d bytes)", start, number, p->slen);
     }
     return TCL_OK;
 }
@@ -1390,11 +1976,14 @@ static int do_present (void *o, Tcl_Interp *interp,
 static int do_loadFile (void *o, Tcl_Interp *interp,
                         int argc, char **argv)
 {
-    IRSetObj *setobj = o;
+    IrTcl_SetObj *setobj = o;
     FILE *inf;
+    size_t size;
     int  no = 1;
-    const char *buf;
+    char *buf;
 
+    if (argc <= 0)
+        return TCL_OK;
     if (argc < 3)
     {
         interp->result = "wrong # args";
@@ -1406,16 +1995,13 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
         Tcl_AppendResult (interp, "Cannot open ", argv[2], NULL);
         return TCL_ERROR;
     }
-    while ((buf = iso2709_read (inf)))
+    while ((buf = ir_tcl_fread_marc (inf, &size)))
     {
-        IRRecordList *rl;
-        Iso2709Rec rec;
+        IrTcl_RecordList *rl;
 
-        rec = iso2709_cvt (buf);
-        if (!rec)
-            break;
         rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord);
-        rl->u.marc.rec = rec;
+        rl->u.dbrec.buf = buf;
+	rl->u.dbrec.size = size;
         no++;
     }
     setobj->numberOfRecordsReturned = no-1;
@@ -1423,33 +2009,45 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
     return TCL_OK;
 }
 
-/* 
- * ir_set_obj_method: IR Set Object methods
- */
-static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    static IRMethod tab[] = {
+static IrTcl_Method ir_set_method_tab[] = {
     { 0, "search",                  do_search },
     { 0, "searchStatus",            do_searchStatus },
+    { 0, "presentStatus",           do_presentStatus },
+    { 0, "nextResultSetPosition",   do_nextResultSetPosition },
     { 0, "setName",                 do_setName },
     { 0, "resultCount",             do_resultCount },
     { 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },
     { 0, "present",                 do_present },
+    { 0, "type",                    do_type },
+    { 0, "getMarc",                 do_getMarc },
     { 0, "recordType",              do_recordType },
-    { 0, "recordMarc",              do_recordMarc },
-    { 0, "recordDiag",              do_recordDiag },
+    { 0, "diag",                    do_diag },
     { 0, "responseStatus",          do_responseStatus },
     { 0, "loadFile",                do_loadFile },
     { 0, NULL, NULL}
-    };
+};
+
+/* 
+ * ir_set_obj_method: IR Set Object methods
+ */
+static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    IrTcl_Methods tabs[3];
+    IrTcl_SetObj *p = clientData;
 
     if (argc < 2)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    return ir_method (clientData, interp, argc, argv, tab);
+    tabs[0].tab = ir_set_method_tab;
+    tabs[0].obj = p;
+    tabs[1].tab = ir_set_c_method_tab;
+    tabs[1].obj = &p->set_inher;
+    tabs[2].tab = NULL;
+
+    return ir_method (interp, argc, argv, tabs);
 }
 
 /* 
@@ -1457,33 +2055,93 @@ static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
  */
 static void ir_set_obj_delete (ClientData clientData)
 {
-    free ( (void*) clientData);
+    IrTcl_Methods tabs[3];
+    IrTcl_SetObj *p = clientData;
+
+    tabs[0].tab = ir_set_method_tab;
+    tabs[0].obj = p;
+    tabs[1].tab = ir_set_c_method_tab;
+    tabs[1].obj = &p->set_inher;
+    tabs[2].tab = NULL;
+
+    ir_method (NULL, -1, NULL, tabs);
+
+    free (p);
 }
 
-/* 
+/*
  * ir_set_obj_mk: IR Set Object creation
  */
 static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
-			     int argc, char **argv)
+                          int argc, char **argv)
 {
-    Tcl_CmdInfo parent_info;
-    IRSetObj *obj;
-    const char *suffix;
+    IrTcl_Methods tabs[3];
+    IrTcl_SetObj *obj;
 
-    if (argc != 2)
+    if (argc < 2 || argc > 3)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    if (get_parent_info (interp, argv[1], &parent_info, &suffix) == TCL_ERROR)
-        return TCL_ERROR;
     if (!(obj = ir_malloc (interp, sizeof(*obj))))
         return TCL_ERROR;
-    if (ir_strdup (interp, &obj->setName, suffix) == TCL_ERROR)
+    else if (argc == 3)
+    {
+        Tcl_CmdInfo parent_info;
+        int i;
+        IrTcl_SetCObj *dst;
+        IrTcl_SetCObj *src;
+
+        if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))
+        {
+            interp->result = "No parent";
+            return TCL_ERROR;
+        }
+        obj->parent = (IrTcl_Obj *) parent_info.clientData;
+
+        dst = &obj->set_inher;
+        src = &obj->parent->set_inher;
+
+        dst->num_databaseNames = src->num_databaseNames;
+        if (!(dst->databaseNames =
+              ir_malloc (interp, sizeof (*dst->databaseNames)
+                         * dst->num_databaseNames)))
+            return TCL_ERROR;
+        for (i = 0; i < dst->num_databaseNames; i++)
+        {
+            if (ir_strdup (interp, &dst->databaseNames[i],
+                           src->databaseNames[i]) == TCL_ERROR)
+                return TCL_ERROR;
+        }
+        if (ir_strdup (interp, &dst->queryType, src->queryType)
+            == TCL_ERROR)
+            return TCL_ERROR;
+
+        if (ir_strdup (interp, &dst->referenceId, src->referenceId)
+            == TCL_ERROR)
+            return TCL_ERROR;
+
+        if (src->preferredRecordSyntax && 
+            (dst->preferredRecordSyntax 
+             = malloc (sizeof(*dst->preferredRecordSyntax))))
+            *dst->preferredRecordSyntax = *src->preferredRecordSyntax;
+        else
+            dst->preferredRecordSyntax = NULL;
+        dst->replaceIndicator = src->replaceIndicator;
+        dst->smallSetUpperBound = src->smallSetUpperBound;
+        dst->largeSetLowerBound = src->largeSetLowerBound;
+        dst->mediumSetPresentNumber = src->mediumSetPresentNumber;
+    }   
+    else
+        obj->parent = NULL;
+
+    tabs[0].tab = ir_set_method_tab;
+    tabs[0].obj = obj;
+    tabs[1].tab = NULL;
+
+    if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
         return TCL_ERROR;
-    obj->record_list = NULL;
-    obj->addinfo = NULL;
-    obj->parent = (IRObj *) parent_info.clientData;
+
     Tcl_CreateCommand (interp, argv[1], ir_set_obj_method,
                        (ClientData) obj, ir_set_obj_delete);
     return TCL_OK;
@@ -1496,19 +2154,26 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
  */
 static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
 {
-    Z_ScanRequest req;
-    Z_APDU apdu, *apdup = &apdu;
-    IRScanObj *obj = o;
-    IRObj *p = obj->parent;
+    Z_ScanRequest *req;
+    Z_APDU *apdu;
+    IrTcl_ScanObj *obj = o;
+    IrTcl_Obj *p = obj->parent;
     int r;
+    oident bib1;
+#if CCL2RPN
+    struct ccl_rpn_node *rpn;
+    int pos;
+#endif
 
+    if (argc <= 0)
+        return TCL_OK;
     p->scan_child = o;
     if (argc != 3)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    if (!p->num_databaseNames)
+    if (!p->set_inher.num_databaseNames)
     {
         interp->result = "no databaseNames";
 	return TCL_ERROR;
@@ -1518,46 +2183,54 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
         interp->result = "not connected";
 	return TCL_ERROR;
     }
-    apdu.which = Z_APDU_scanRequest;
-    apdu.u.scanRequest = &req;
-    req.referenceId = NULL;
-    req.num_databaseNames = p->num_databaseNames;
-    req.databaseNames = p->databaseNames;
-    req.attributeSet = oid_getoidbyent (&p->bib1);
+    odr_reset (p->odr_out);
 
-    if (!(req.termListAndStartPoint =
-          ir_malloc (interp, sizeof(*req.termListAndStartPoint))))
-        return TCL_ERROR;
-    req.termListAndStartPoint->num_attributes = 0;
-    req.termListAndStartPoint->attributeList = NULL;
-    if (!(req.termListAndStartPoint->term = ir_malloc (interp,
-                                                       sizeof(Z_Term))))
-        return TCL_ERROR;
-    req.termListAndStartPoint->term->which = Z_Term_general;
-    if (!(req.termListAndStartPoint->term->u.general = 
-        ir_malloc (interp, sizeof(*req.termListAndStartPoint->
-                                  term->u.general))))
+    bib1.proto = p->protocol_type;
+    bib1.class = CLASS_ATTSET;
+    bib1.value = VAL_BIB1;
+
+    apdu = zget_APDU (p->odr_out, Z_APDU_scanRequest);
+    req = apdu->u.scanRequest;
+
+    set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);
+    req->num_databaseNames = p->set_inher.num_databaseNames;
+    req->databaseNames = p->set_inher.databaseNames;
+    req->attributeSet = oid_getoidbyent (&bib1);
+
+#if !CCL2RPN
+    if (!(req->termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
+    {
+        Tcl_AppendResult (interp, "Syntax error in query", NULL);
+	return TCL_ERROR;
+    }
+#else
+    rpn = ccl_find_str(p->bibset, argv[2], &r, &pos);
+    if (r)
+    {
+        Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg (r), NULL);
         return TCL_ERROR;
-    if (ir_strdup (interp, &req.termListAndStartPoint->term->u.general->buf,
-                   argv[2]) == TCL_ERROR)
+    }
+    ccl_pr_tree (rpn, stderr);
+    fprintf (stderr, "\n");
+    if (!(req->termListAndStartPoint = ccl_scan_query (rpn)))
         return TCL_ERROR;
-    req.termListAndStartPoint->term->u.general->len = 
-        req.termListAndStartPoint->term->u.general->size = strlen(argv[2]);
-    req.stepSize = &obj->stepSize;
-    req.numberOfTermsRequested = &obj->numberOfTermsRequested;
-    req.preferredPositionInResponse = &obj->preferredPositionInResponse;
-    printf ("stepSize=%d\n", *req.stepSize);
-    printf ("numberOfTermsRequested=%d\n", *req.numberOfTermsRequested);
-    printf ("preferredPositionInResponse=%d\n",
-            *req.preferredPositionInResponse);
-
-    if (!z_APDU (p->odr_out, &apdup, 0))
+#endif
+    req->stepSize = &obj->stepSize;
+    req->numberOfTermsRequested = &obj->numberOfTermsRequested;
+    req->preferredPositionInResponse = &obj->preferredPositionInResponse;
+    logf (LOG_DEBUG, "stepSize=%d", *req->stepSize);
+    logf (LOG_DEBUG, "numberOfTermsRequested=%d",
+          *req->numberOfTermsRequested);
+    logf (LOG_DEBUG, "preferredPositionInResponse=%d",
+          *req->preferredPositionInResponse);
+
+    if (!z_APDU (p->odr_out, &apdu, 0))
     {
         interp->result = odr_errlist [odr_geterror (p->odr_out)];
         odr_reset (p->odr_out);
         return TCL_ERROR;
     } 
-    p->sbuf = odr_getbuf (p->odr_out, &p->slen);
+    p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
     if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
     {
         interp->result = "cs_put failed in scan";
@@ -1566,11 +2239,11 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
     else if (r == 1)
     {
         ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf("Sent part of scanRequest (%d bytes).\n", p->slen);
+        logf (LOG_DEBUG, "Sent part of scanRequest (%d bytes)", p->slen);
     }
     else
     {
-        printf ("Whole scan request\n");
+        logf (LOG_DEBUG, "Whole scan request (%d bytes)", p->slen);
     }
     return TCL_OK;
 }
@@ -1581,7 +2254,12 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
 static int do_stepSize (void *obj, Tcl_Interp *interp,
                         int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
+    if (argc <= 0)
+    {
+        p->stepSize = 0;
+        return TCL_OK;
+    }
     return get_set_int (&p->stepSize, interp, argc, argv);
 }
 
@@ -1591,7 +2269,13 @@ static int do_stepSize (void *obj, Tcl_Interp *interp,
 static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,
                                       int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
+
+    if (argc <= 0)
+    {
+        p->numberOfTermsRequested = 20;
+        return TCL_OK;
+    }
     return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
 }
 
@@ -1602,7 +2286,13 @@ static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,
 static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,
                                            int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
+
+    if (argc <= 0)
+    {
+        p->preferredPositionInResponse = 1;
+        return TCL_OK;
+    }
     return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);
 }
 
@@ -1612,7 +2302,10 @@ static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,
 static int do_scanStatus (void *obj, Tcl_Interp *interp,
                           int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
+
+    if (argc <= 0)
+        return TCL_OK;
     return get_set_int (&p->scanStatus, interp, argc, argv);
 }
 
@@ -1622,7 +2315,10 @@ static int do_scanStatus (void *obj, Tcl_Interp *interp,
 static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,
                                        int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
+
+    if (argc <= 0)
+        return TCL_OK;
     return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);
 }
 
@@ -1632,7 +2328,10 @@ static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,
 static int do_positionOfTerm (void *obj, Tcl_Interp *interp,
                               int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
+
+    if (argc <= 0)
+        return TCL_OK;
     return get_set_int (&p->positionOfTerm, interp, argc, argv);
 }
 
@@ -1641,10 +2340,28 @@ static int do_positionOfTerm (void *obj, Tcl_Interp *interp,
  */
 static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
 {
-    IRScanObj *p = obj;
+    IrTcl_ScanObj *p = obj;
     int i;
     char numstr[20];
 
+    if (argc == 0)
+    {
+        p->entries_flag = 0;
+	p->entries = NULL;
+	p->nonSurrogateDiagnosticNum = 0;
+        p->nonSurrogateDiagnosticList = 0;
+	return TCL_OK;
+    }
+    else if (argc == -1)
+    {
+        p->entries_flag = 0;
+	/* release entries */
+        p->entries = NULL;
+
+        ir_deleteDiags (&p->nonSurrogateDiagnosticList, 
+                        &p->nonSurrogateDiagnosticNum);
+	return TCL_OK;
+    }
     if (argc != 3)
     {
         interp->result = "wrong # args";
@@ -1667,21 +2384,15 @@ static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
 	Tcl_AppendElement (interp, numstr);
 	break;
     case Z_Entry_surrogateDiagnostic:
-        return 
-	    mk_nonSurrogateDiagnostics (interp, p->entries[i].u.diag.condition,
-	                                p->entries[i].u.diag.addinfo);
+        Tcl_AppendElement (interp, "SD");
+        return ir_diagResult (interp, p->entries[i].u.diag.list,
+                              p->entries[i].u.diag.num);
 	break;
     }
     return TCL_OK;
 }
 
-/* 
- * ir_scan_obj_method: IR Scan Object methods
- */
-static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
-                               int argc, char **argv)
-{
-    static IRMethod tab[] = {
+static IrTcl_Method ir_scan_method_tab[] = {
     { 0, "scan",                    do_scan },
     { 0, "stepSize",                do_stepSize },
     { 0, "numberOfTermsRequested",  do_numberOfTermsRequested },
@@ -1691,14 +2402,26 @@ static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
     { 0, "positionOfTerm",          do_positionOfTerm },
     { 0, "scanLine",                do_scanLine },
     { 0, NULL, NULL}
-    };
+};
+
+/* 
+ * ir_scan_obj_method: IR Scan Object methods
+ */
+static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
+                               int argc, char **argv)
+{
+    IrTcl_Methods tabs[2];
 
     if (argc < 2)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    return ir_method (clientData, interp, argc, argv, tab);
+    tabs[0].tab = ir_scan_method_tab;
+    tabs[0].obj = clientData;
+    tabs[1].tab = NULL;
+
+    return ir_method (interp, argc, argv, tabs);
 }
 
 /* 
@@ -1706,7 +2429,15 @@ static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
  */
 static void ir_scan_obj_delete (ClientData clientData)
 {
-    free ( (void*) clientData);
+    IrTcl_Methods tabs[2];
+    IrTcl_ScanObj *obj = clientData;
+
+    tabs[0].tab = ir_scan_method_tab;
+    tabs[0].obj = obj;
+    tabs[1].tab = NULL;
+
+    ir_method (NULL, -1, NULL, tabs);
+    free (obj);
 }
 
 /* 
@@ -1716,26 +2447,30 @@ static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
                            int argc, char **argv)
 {
     Tcl_CmdInfo parent_info;
-    IRScanObj *obj;
+    IrTcl_ScanObj *obj;
+    IrTcl_Methods tabs[2];
 
-    if (argc != 2)
+    if (argc != 3)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    if (get_parent_info (interp, argv[1], &parent_info, NULL) == TCL_ERROR)
-        return TCL_ERROR;
+    if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))
+    {
+        interp->result = "No parent";
+	return TCL_ERROR;
+    }
     if (!(obj = ir_malloc (interp, sizeof(*obj))))
         return TCL_ERROR;
 
-    obj->stepSize = 0;
-    obj->numberOfTermsRequested = 20;
-    obj->preferredPositionInResponse = 1;
+    obj->parent = (IrTcl_Obj *) parent_info.clientData;
 
-    obj->entries = NULL;
-    obj->nonSurrogateDiagnostics = NULL;
+    tabs[0].tab = ir_scan_method_tab;
+    tabs[0].obj = obj;
+    tabs[1].tab = NULL;
 
-    obj->parent = (IRObj *) parent_info.clientData;
+    if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
+        return TCL_ERROR;
     Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,
                        (ClientData) obj, ir_scan_obj_delete);
     return TCL_OK;
@@ -1745,61 +2480,111 @@ static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
 
 static void ir_initResponse (void *obj, Z_InitResponse *initrs)
 {
+    IrTcl_Obj *p = obj;
+
+    p->initResult = *initrs->result ? 1 : 0;
     if (!*initrs->result)
-        printf("Connection rejected by target.\n");
+        logf (LOG_DEBUG, "Connection rejected by target");
     else
-        printf("Connection accepted by target.\n");
-    if (initrs->implementationId)
-            printf("ID     : %s\n", initrs->implementationId);
-    if (initrs->implementationName)
-        printf("Name   : %s\n", initrs->implementationName);
-    if (initrs->implementationVersion)
-        printf("Version: %s\n", initrs->implementationVersion);
-    if (initrs->maximumRecordSize)
-        printf ("MaximumRecordSize=%d\n", *initrs->maximumRecordSize);
-    if (initrs->preferredMessageSize)
-        printf ("PreferredMessageSize=%d\n", *initrs->preferredMessageSize);
-#if 0
+        logf (LOG_DEBUG, "Connection accepted by target");
+
+    get_referenceId (&p->set_inher.referenceId, initrs->referenceId);
+
+    free (p->targetImplementationId);
+    ir_strdup (p->interp, &p->targetImplementationId,
+               initrs->implementationId);
+    free (p->targetImplementationName);
+    ir_strdup (p->interp, &p->targetImplementationName,
+               initrs->implementationName);
+    free (p->targetImplementationVersion);
+    ir_strdup (p->interp, &p->targetImplementationVersion,
+               initrs->implementationVersion);
+
+    p->maximumRecordSize = *initrs->maximumRecordSize;
+    p->preferredMessageSize = *initrs->preferredMessageSize;
+    
+    memcpy (&p->options, initrs->options, sizeof(initrs->options));
+    memcpy (&p->protocolVersion, initrs->protocolVersion,
+            sizeof(initrs->protocolVersion));
+    free (p->userInformationField);
+    p->userInformationField = NULL;
     if (initrs->userInformationField)
     {
-        printf("UserInformationfield:\n");
-        odr_external(&print, (Odr_external**)&initrs->
-                         userInformationField, 0);
+        int len;
+
+        if (initrs->userInformationField->which == ODR_EXTERNAL_octet && 
+            (p->userInformationField =
+             malloc ((len = 
+                      initrs->userInformationField->u.octet_aligned->len)
+                     +1)))
+        {
+            memcpy (p->userInformationField,
+                    initrs->userInformationField->u.octet_aligned->buf,
+                        len);
+            (p->userInformationField)[len] = '\0';
+        }
+    }
+}
+
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num)
+{
+    int i;
+    for (i = 0; i<*dst_num; i++)
+        free (dst_list[i]->addinfo);
+    free (*dst_list);
+    *dst_list = NULL;
+    *dst_num = 0;
+}
+
+static void ir_handleDiags (IrTcl_Diagnostic **dst_list, int *dst_num,
+                    Z_DiagRec **list, int num)
+{
+    int i;
+    char *addinfo;
+
+    *dst_num = num;
+    *dst_list = malloc (sizeof(**dst_list) * num);
+    if (!*dst_list) 
+    {
+        *dst_num = 0;
+        return;
+    }
+    for (i = 0; i<num; i++)
+    {
+        switch (list[i]->which)
+        {
+        case Z_DiagRec_defaultFormat:
+            (*dst_list)[i].condition = *list[i]->u.defaultFormat->condition;
+            addinfo = list[i]->u.defaultFormat->addinfo;
+            if (addinfo && 
+                ((*dst_list)[i].addinfo = malloc (strlen(addinfo)+1)))
+                strcpy ((*dst_list)[i].addinfo, addinfo);
+            break;
+        default:
+            (*dst_list)[i].addinfo = NULL;
+            (*dst_list)[i].condition = 0;
+        }
     }
-#endif
 }
 
 static void ir_handleRecords (void *o, Z_Records *zrs)
 {
-    IRObj *p = o;
-    IRSetObj *setobj = p->set_child;
+    IrTcl_Obj *p = o;
+    IrTcl_SetObj *setobj = p->set_child;
+
+    int offset;
+    IrTcl_RecordList *rl;
 
     setobj->which = zrs->which;
     setobj->recordFlag = 1;
-    if (zrs->which == Z_Records_NSD)
-    {
-        const char *addinfo;
-        
-        setobj->numberOfRecordsReturned = 0;
-        setobj->condition = *zrs->u.nonSurrogateDiagnostic->condition;
-        free (setobj->addinfo);
-        setobj->addinfo = NULL;
-        addinfo = zrs->u.nonSurrogateDiagnostic->addinfo;
-        if (addinfo && (setobj->addinfo = malloc (strlen(addinfo) + 1)))
-            strcpy (setobj->addinfo, addinfo);
-        printf ("Diagnostic response. %s (%d): %s\n",
-                diagbib1_str (setobj->condition),
-                setobj->condition,
-                setobj->addinfo ? setobj->addinfo : "");
-    }
-    else
+    
+    ir_deleteDiags (&setobj->nonSurrogateDiagnosticList,
+                    &setobj->nonSurrogateDiagnosticNum);
+    if (zrs->which == Z_Records_DBOSD)
     {
-        int offset;
-        IRRecordList *rl;
-        
         setobj->numberOfRecordsReturned = 
             zrs->u.databaseOrSurDiagnostics->num_records;
-        printf ("Got %d records\n", setobj->numberOfRecordsReturned);
+        logf (LOG_DEBUG, "Got %d records", setobj->numberOfRecordsReturned);
         for (offset = 0; offset<setobj->numberOfRecordsReturned; offset++)
         {
             rl = new_IR_record (setobj, setobj->start + offset,
@@ -1807,16 +2592,12 @@ static void ir_handleRecords (void *o, Z_Records *zrs)
                                 records[offset]->which);
             if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
             {
-                Z_DiagRec *diagrec;
-                
-                diagrec = zrs->u.databaseOrSurDiagnostics->
-                    records[offset]->u.surrogateDiagnostic;
-                
-                rl->u.diag.condition = *diagrec->condition;
-                if (diagrec->addinfo && (rl->u.diag.addinfo =
-                                         malloc (strlen (diagrec->addinfo)+1)))
-                    strcpy (rl->u.diag.addinfo, diagrec->addinfo);
-            }
+                ir_handleDiags (&rl->u.surrogateDiagnostics.list,
+                                &rl->u.surrogateDiagnostics.num,
+                                &zrs->u.databaseOrSurDiagnostics->
+                                records[offset]->u.surrogateDiagnostic,
+                                1);
+            } 
             else
             {
                 Z_DatabaseRecord *zr; 
@@ -1825,85 +2606,129 @@ static void ir_handleRecords (void *o, Z_Records *zrs)
                 zr = zrs->u.databaseOrSurDiagnostics->records[offset]
                     ->u.databaseRecord;
                 oe = (Odr_external*) zr;
-                if (oe->which == ODR_EXTERNAL_octet
-                    && zr->u.octet_aligned->len)
+		rl->u.dbrec.size = zr->u.octet_aligned->len;
+                rl->u.dbrec.type = VAL_USMARC;
+                if (oe->which == ODR_EXTERNAL_octet && rl->u.dbrec.size > 0)
                 {
                     const char *buf = (char*) zr->u.octet_aligned->buf;
-                    rl->u.marc.rec = iso2709_cvt (buf);
+                    if ((rl->u.dbrec.buf = malloc (rl->u.dbrec.size)))
+		        memcpy (rl->u.dbrec.buf, buf, rl->u.dbrec.size);
+                    if (oe->direct_reference)
+                    {
+                        struct oident *ident = 
+                            oid_getentbyoid (oe->direct_reference);
+                        rl->u.dbrec.type = ident->value;
+                    }
                 }
                 else
-                    rl->u.marc.rec = NULL;
+                    rl->u.dbrec.buf = NULL;
             }
         }
     }
+    else if (zrs->which == Z_Records_multipleNSD)
+    {
+        logf (LOG_DEBUG, "multipleNonSurrogateDiagnostic %d",
+              zrs->u.multipleNonSurDiagnostics->num_diagRecs);
+        setobj->numberOfRecordsReturned = 0;
+        ir_handleDiags (&setobj->nonSurrogateDiagnosticList,
+                        &setobj->nonSurrogateDiagnosticNum,
+                        zrs->u.multipleNonSurDiagnostics->diagRecs,
+                        zrs->u.multipleNonSurDiagnostics->num_diagRecs);
+    }
+    else
+    {
+        logf (LOG_DEBUG, "NonSurrogateDiagnostic");
+        setobj->numberOfRecordsReturned = 0;
+        ir_handleDiags (&setobj->nonSurrogateDiagnosticList,
+                        &setobj->nonSurrogateDiagnosticNum,
+                        &zrs->u.nonSurrogateDiagnostic,
+                        1);
+    }
 }
 
 static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
 {    
-    IRObj *p = o;
-    IRSetObj *setobj = p->set_child;
+    IrTcl_Obj *p = o;
+    IrTcl_SetObj *setobj = p->set_child;
     Z_Records *zrs = searchrs->records;
 
-    if (setobj)
+    logf (LOG_DEBUG, "Received search response");
+    if (!setobj)
     {
-        setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
-        setobj->resultCount = *searchrs->resultCount;
-        printf ("Search response %d, %d hits\n", 
-                 setobj->searchStatus, setobj->resultCount);
-        if (zrs)
-            ir_handleRecords (o, zrs);
-        else
-            setobj->recordFlag = 0;
+        logf (LOG_DEBUG, "Search response, no object!");
+	return;
     }
+    setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
+    get_referenceId (&setobj->set_inher.referenceId, searchrs->referenceId);
+    setobj->resultCount = *searchrs->resultCount;
+    if (searchrs->presentStatus)
+        setobj->presentStatus = *searchrs->presentStatus;
+    if (searchrs->nextResultSetPosition)
+        setobj->nextResultSetPosition = *searchrs->nextResultSetPosition;
+
+    logf (LOG_DEBUG, "Search response %d, %d hits", 
+          setobj->searchStatus, setobj->resultCount);
+    if (zrs)
+        ir_handleRecords (o, zrs);
     else
-        printf ("Search response, no object!\n");
+        setobj->recordFlag = 0;
 }
 
 
 static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
 {
-    IRObj *p = o;
-    IRSetObj *setobj = p->set_child;
+    IrTcl_Obj *p = o;
+    IrTcl_SetObj *setobj = p->set_child;
     Z_Records *zrs = presrs->records;
     
-    printf ("Received presentResponse\n");
+    logf (LOG_DEBUG, "Received present response");
+    if (!setobj)
+    {
+        logf (LOG_DEBUG, "Present response, no object!");
+	return;
+    }
+    setobj->presentStatus = *presrs->presentStatus;
+    get_referenceId (&setobj->set_inher.referenceId, presrs->referenceId);
+    setobj->nextResultSetPosition = *presrs->nextResultSetPosition;
     if (zrs)
         ir_handleRecords (o, zrs);
     else
     {
         setobj->recordFlag = 0;
-        printf ("No records!\n");
+        logf (LOG_DEBUG, "No records!");
     }
 }
 
 static void ir_scanResponse (void *o, Z_ScanResponse *scanrs)
 {
-    IRObj *p = o;
-    IRScanObj *scanobj = p->scan_child;
+    IrTcl_Obj *p = o;
+    IrTcl_ScanObj *scanobj = p->scan_child;
     
-    printf ("Received scanResponse\n");
+    logf (LOG_DEBUG, "Received scanResponse");
 
+    get_referenceId (&p->set_inher.referenceId, scanrs->referenceId);
     scanobj->scanStatus = *scanrs->scanStatus;
-    printf ("scanStatus=%d\n", scanobj->scanStatus);
+    logf (LOG_DEBUG, "scanStatus=%d", scanobj->scanStatus);
 
     if (scanrs->stepSize)
         scanobj->stepSize = *scanrs->stepSize;
-    printf ("stepSize=%d\n", scanobj->stepSize);
+    logf (LOG_DEBUG, "stepSize=%d", scanobj->stepSize);
 
     scanobj->numberOfEntriesReturned = *scanrs->numberOfEntriesReturned;
-    printf ("numberOfEntriesReturned=%d\n", scanobj->numberOfEntriesReturned);
+    logf (LOG_DEBUG, "numberOfEntriesReturned=%d",
+          scanobj->numberOfEntriesReturned);
 
     if (scanrs->positionOfTerm)
         scanobj->positionOfTerm = *scanrs->positionOfTerm;
     else
         scanobj->positionOfTerm = -1;
-    printf ("positionOfTerm=%d\n", scanobj->positionOfTerm);
+    logf (LOG_DEBUG, "positionOfTerm=%d", scanobj->positionOfTerm);
 
     free (scanobj->entries);
     scanobj->entries = NULL;
-    free (scanobj->nonSurrogateDiagnostics);
-    scanobj->nonSurrogateDiagnostics = NULL;
 
+    ir_deleteDiags (&scanobj->nonSurrogateDiagnosticList,
+                    &scanobj->nonSurrogateDiagnosticNum);
     if (scanrs->entries)
     {
         int i;
@@ -1942,22 +2767,21 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs)
 		        scanobj->entries[i].u.term.globalOccurrences = 0;
                     break;
 		case Z_Entry_surrogateDiagnostic:
-		    scanobj->entries[i].u.diag.addinfo = 
-		            malloc (1+strlen(ze->u.surrogateDiagnostic->
-			                     addinfo));
-                    strcpy (scanobj->entries[i].u.diag.addinfo,
-		            ze->u.surrogateDiagnostic->addinfo);
-		    scanobj->entries[i].u.diag.condition = 
-		        *ze->u.surrogateDiagnostic->condition;
+                    ir_handleDiags (&scanobj->entries[i].u.diag.list,
+                                    &scanobj->entries[i].u.diag.num,
+                                    &ze->u.surrogateDiagnostic,
+                                    1);
 		    break;
 		}
 	    }
             break;
 	case Z_ListEntries_nonSurrogateDiagnostics:
-	    scanobj->num_diagRecs = scanrs->entries->
-	                          u.nonSurrogateDiagnostics->num_diagRecs;
-	    scanobj->nonSurrogateDiagnostics = malloc (scanobj->num_diagRecs *
-	                          sizeof(*scanobj->nonSurrogateDiagnostics));
+            ir_handleDiags (&scanobj->nonSurrogateDiagnosticList,
+                            &scanobj->nonSurrogateDiagnosticNum,
+                            scanrs->entries->u.nonSurrogateDiagnostics->
+                            diagRecs,
+                            scanrs->entries->u.nonSurrogateDiagnostics->
+                            num_diagRecs);
             break;
 	}
     }
@@ -1970,7 +2794,7 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs)
  */
 void ir_select_read (ClientData clientData)
 {
-    IRObj *p = clientData;
+    IrTcl_Obj *p = clientData;
     Z_APDU *apdu;
     int r;
 
@@ -1978,42 +2802,54 @@ void ir_select_read (ClientData clientData)
     {
         r = cs_rcvconnect (p->cs_link);
         if (r == 1)
+        {
+            logf (LOG_WARN, "cs_rcvconnect returned 1");
             return;
+        }
         p->connectFlag = 0;
         ir_select_remove_write (cs_fileno (p->cs_link), p);
         if (r < 0)
         {
-            printf ("cs_rcvconnect error\n");
+            logf (LOG_DEBUG, "cs_rcvconnect error");
             if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            do_disconnect (p, NULL, 0, NULL);
+                IrTcl_eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 2, NULL);
             return;
         }
         if (p->callback)
-	    Tcl_Eval (p->interp, p->callback);
+	    IrTcl_eval (p->interp, p->callback);
         return;
     }
     do
     {
-        if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in))  <= 0)
+	/* signal one more use of ir object - callbacks must not
+	   release the ir memory (p pointer) */
+	++(p->ref_count);
+        if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) <= 0)
         {
-            printf ("cs_get failed\n");
+            logf (LOG_DEBUG, "cs_get failed, code %d", r);
             ir_select_remove (cs_fileno (p->cs_link), p);
             if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            do_disconnect (p, NULL, 0, NULL);
+                IrTcl_eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 2, NULL);
+
+	    /* relase ir object now if callback deleted it */
+	    ir_obj_delete (p);
             return;
         }        
         if (r == 1)
             return ;
-        odr_setbuf (p->odr_in, p->buf_in, r);
-        printf ("cs_get ok, got %d\n", r);
+        odr_setbuf (p->odr_in, p->buf_in, r, 0);
+        logf (LOG_DEBUG, "cs_get ok, got %d", r);
         if (!z_APDU (p->odr_in, &apdu, 0))
         {
-            printf ("%s\n", odr_errlist [odr_geterror (p->odr_in)]);
+            logf (LOG_DEBUG, "%s", odr_errlist [odr_geterror (p->odr_in)]);
             if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            do_disconnect (p, NULL, 0, NULL);
+                IrTcl_eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 2, NULL);
+
+	    /* release ir object now if failback deleted it */
+	    ir_obj_delete (p);
             return;
         }
         switch(apdu->which)
@@ -2031,15 +2867,21 @@ void ir_select_read (ClientData clientData)
             ir_scanResponse (p, apdu->u.scanResponse);
             break;
         default:
-            printf("Received unknown APDU type (%d).\n", 
-                   apdu->which);
+            logf (LOG_WARN, "Received unknown APDU type (%d)", apdu->which);
             if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            do_disconnect (p, NULL, 0, NULL);
+                IrTcl_eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 2, NULL);
         }
+        odr_reset (p->odr_in);
         if (p->callback)
-	    Tcl_Eval (p->interp, p->callback);
-    } while (cs_more (p->cs_link));    
+	    IrTcl_eval (p->interp, p->callback);
+	if (p->ref_count == 1)
+	{
+	    ir_obj_delete (p);
+	    return;
+	}
+	--(p->ref_count);
+    } while (p->cs_link && cs_more (p->cs_link));    
 }
 
 /*
@@ -2047,10 +2889,10 @@ void ir_select_read (ClientData clientData)
  */
 void ir_select_write (ClientData clientData)
 {
-    IRObj *p = clientData;
+    IrTcl_Obj *p = clientData;
     int r;
 
-    printf ("In write handler.....\n");
+    logf (LOG_DEBUG, "In write handler");
     if (p->connectFlag)
     {
         r = cs_rcvconnect (p->cs_link);
@@ -2059,24 +2901,24 @@ void ir_select_write (ClientData clientData)
         p->connectFlag = 0;
         if (r < 0)
         {
-            printf ("cs_rcvconnect error\n");
+            logf (LOG_DEBUG, "cs_rcvconnect error");
             ir_select_remove_write (cs_fileno (p->cs_link), p);
             if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            do_disconnect (p, NULL, 0, NULL);
+                IrTcl_eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 2, NULL);
             return;
         }
         ir_select_remove_write (cs_fileno (p->cs_link), p);
         if (p->callback)
-	    Tcl_Eval (p->interp, p->callback);
+	    IrTcl_eval (p->interp, p->callback);
         return;
     }
     if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
     {   
-        printf ("select write fail\n");
+        logf (LOG_DEBUG, "select write fail");
         if (p->failback)
-            Tcl_Eval (p->interp, p->failback);
-        do_disconnect (p, NULL, 0, NULL);
+            IrTcl_eval (p->interp, p->failback);
+        do_disconnect (p, NULL, 2, NULL);
     }
     else if (r == 0)            /* remove select bit */
     {
@@ -2097,6 +2939,7 @@ int ir_tcl_init (Tcl_Interp *interp)
     		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand (interp, "ir-scan", ir_scan_obj_mk,
     		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    irTcl_interp = interp;
     return TCL_OK;
 }