X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ir-tcl.c;h=21e810028a581f2d16822d8a0731b19e44f6cd6c;hb=534e39b7986d6cbbfac1c99bcca97d8d1fb5e990;hp=43f9963f377c990b1526f8b39c2cf1fba52f879e;hpb=495243c2c85b5c01b6f3cfe026c5ac9acb7f62fd;p=ir-tcl-moved-to-github.git

diff --git a/ir-tcl.c b/ir-tcl.c
index 43f9963..21e8100 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -5,7 +5,116 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.54  1995-08-24 12:25:16  adam
+ * Revision 1.83  1996-03-05 09:21:09  adam
+ * Bug fix: memory used by GRS records wasn't freed.
+ * Rewrote some of the error handling code - the connection is always
+ * closed before failback is called.
+ * If failback is defined the send APDU methods (init, search, ...) will
+ * return OK but invoke failback (as is the case if the write operation
+ * fails).
+ * Bug fix: ref_count in assoc object could grow if fraction of PDU was
+ * read.
+ *
+ * Revision 1.82  1996/02/29  15:30:21  adam
+ * Export of IrTcl functionality to extensions.
+ *
+ * Revision 1.81  1996/02/26  18:38:32  adam
+ * Work on export of set methods.
+ *
+ * Revision 1.80  1996/02/23  17:31:39  adam
+ * More functions made available to the wais tcl extension.
+ *
+ * Revision 1.79  1996/02/23  13:41:38  adam
+ * Work on public access to simple ir class system.
+ *
+ * Revision 1.78  1996/02/21  10:16:08  adam
+ * Simplified select handling. Only one function ir_tcl_select_set has
+ * to be externally defined.
+ *
+ * Revision 1.77  1996/02/20  17:52:58  adam
+ * Uses the YAZ oid system to name record syntax object identifiers.
+ *
+ * Revision 1.76  1996/02/20  16:09:51  adam
+ * Bug fix: didn't set element set names stamp correctly on result
+ * set records when element set names were set to the empty string.
+ *
+ * Revision 1.75  1996/02/19  15:41:53  adam
+ * Better log messages.
+ * Minor improvement of connect method.
+ *
+ * Revision 1.74  1996/02/05  17:58:03  adam
+ * Ported ir-tcl to use the beta releases of tcl7.5/tk4.1.
+ *
+ * Revision 1.73  1996/01/29  11:35:19  adam
+ * Bug fix: cs_type member renamed to comstackType to avoid conflict with
+ * cs_type macro defined by YAZ.
+ *
+ * Revision 1.72  1996/01/19  17:45:34  quinn
+ * Added debugging output
+ *
+ * Revision 1.71  1996/01/19  16:22:38  adam
+ * New method: apduDump - returns information about last incoming APDU.
+ *
+ * Revision 1.70  1996/01/10  09:18:34  adam
+ * PDU specific callbacks implemented: initRespnse, searchResponse,
+ *  presentResponse and scanResponse.
+ * Bug fix in the command line shell (tclmain.c) - discovered on OSF/1.
+ *
+ * Revision 1.69  1996/01/04  16:12:12  adam
+ * Setting PDUType renamed to eventType.
+ *
+ * Revision 1.68  1996/01/04  11:05:22  adam
+ * New setting: PDUType - returns type of last PDU returned from the target.
+ * Fixed a bug in configure/Makefile.
+ *
+ * Revision 1.67  1996/01/03  09:00:51  adam
+ * Updated to use new version of Yaz (names changed to avoid C++ conflict).
+ *
+ * Revision 1.66  1995/11/28  17:26:39  adam
+ * Removed Carriage return from ir-tcl.c!
+ * Removed misc. debug logs.
+ *
+ * Revision 1.65  1995/11/28  13:53:00  quinn
+ * Windows port.
+ *
+ * Revision 1.64  1995/11/13  15:39:18  adam
+ * Bug fix: {small,medium}SetElementSetNames weren't set correctly.
+ * Bug fix: idAuthentication weren't set correctly.
+ *
+ * Revision 1.63  1995/11/13  09:55:39  adam
+ * Multiple records at a position in a result-set with differnt
+ * element specs.
+ *
+ * Revision 1.62  1995/10/18  17:20:33  adam
+ * Work on target setup in client.tcl.
+ *
+ * Revision 1.61  1995/10/18  16:42:42  adam
+ * New settings: smallSetElementSetNames and mediumSetElementSetNames.
+ *
+ * Revision 1.60  1995/10/18  15:43:31  adam
+ * In search: mediumSetElementSetNames and smallSetElementSetNames are
+ * set to elementSetNames.
+ *
+ * Revision 1.59  1995/10/17  12:18:58  adam
+ * Bug fix: when target connection closed, the connection was not
+ * properly reestablished.
+ *
+ * Revision 1.58  1995/10/16  17:00:55  adam
+ * New setting: elementSetNames.
+ * Various client improvements. Medium presentation format looks better.
+ *
+ * Revision 1.57  1995/09/21  13:11:51  adam
+ * Support of dynamic loading.
+ * Test script uses load command if necessary.
+ *
+ * Revision 1.56  1995/08/29  15:30:14  adam
+ * Work on GRS records.
+ *
+ * Revision 1.55  1995/08/28  09:43:25  adam
+ * Minor changes. configure only searches for yaz beta 3 and versions after
+ * that.
+ *
+ * Revision 1.54  1995/08/24  12:25:16  adam
  * Modified to work with yaz 1.0b3.
  *
  * Revision 1.53  1995/08/04  12:49:26  adam
@@ -192,50 +301,76 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/time.h>
+#include <unistd.h>
+#include <time.h>
 #include <assert.h>
 
 #define CS_BLOCK 0
 
+#define IRTCL_GENERIC_FILES 0
+
 #include "ir-tclp.h"
 
-typedef struct {
-    int type;
-    char *name;
-    int (*method) (void *obj, Tcl_Interp *interp, int argc, char **argv);
-} IrTcl_Method;
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);
+
+static void ir_select_notify (ClientData clientData, int r, int w, int e);
+
+void ir_select_add (int fd, void *obj)
+{
+    ir_tcl_select_set (ir_select_notify, fd, obj, 1, 0, 0);
+}
 
-typedef struct {
-    void *obj;
-    IrTcl_Method *tab;
-} IrTcl_Methods;
+void ir_select_add_write (int fd, void *obj)
+{
+    ir_tcl_select_set (ir_select_notify, fd, obj, 1, 1, 0);
+}
 
-static Tcl_Interp *irTcl_interp;
+void ir_select_remove (int fd, void *obj)
+{
+    ir_tcl_select_set (NULL, fd, obj, 0, 0, 0);
+}
 
-static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);
-static int do_disconnect (void *obj, Tcl_Interp *interp, 
-                          int argc, char **argv);
+void ir_select_remove_write (int fd, void *obj)
+{
+    ir_tcl_select_set (ir_select_notify, fd, obj, 1, 0, 0);
+}
+
+static void delete_IR_record (IrTcl_RecordList *rl)
+{
+    switch (rl->which)
+    {
+    case Z_NamePlusRecord_databaseRecord:
+        switch (rl->u.dbrec.type)
+        {
+        case VAL_GRS1:
+            ir_tcl_grs_del (&rl->u.dbrec.u.grs1);
+            break;
+        default:
+        }
+        free (rl->u.dbrec.buf);
+        break;
+    case Z_NamePlusRecord_surrogateDiagnostic:
+        ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+                        &rl->u.surrogateDiagnostics.num);
+        break;
+    }
+    free (rl->elements);
+}
 
 static IrTcl_RecordList *new_IR_record (IrTcl_SetObj *setobj, 
-                                        int no, int which)
+                                        int no, int which, 
+                                        const char *elements)
 {
     IrTcl_RecordList *rl;
 
+    if (elements && !*elements)
+        elements = NULL;
     for (rl = setobj->record_list; rl; rl = rl->next)
     {
-        if (no == rl->no)
+        if (no == rl->no && (!rl->elements || !elements ||
+                             !strcmp(elements, rl->elements)))
         {
-            switch (rl->which)
-            {
-            case Z_NamePlusRecord_databaseRecord:
-	        free (rl->u.dbrec.buf);
-		rl->u.dbrec.buf = NULL;
-                break;
-            case Z_NamePlusRecord_surrogateDiagnostic:
-                ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
-                                &rl->u.surrogateDiagnostics.num);
-                break;
-            }
+            delete_IR_record (rl);
             break;
         }
     }
@@ -247,40 +382,19 @@ static IrTcl_RecordList *new_IR_record (IrTcl_SetObj *setobj,
         setobj->record_list = rl;
     }
     rl->which = which;
+    ir_tcl_strdup (NULL, &rl->elements, elements);
     return rl;
 }
 
-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
+ * ir_tcl_eval
  */
-int IrTcl_eval (Tcl_Interp *interp, const char *command)
+int ir_tcl_eval (Tcl_Interp *interp, const char *command)
 {
     char *tmp = ir_tcl_malloc (strlen(command)+1);
     int r;
 
+    logf (LOG_DEBUG, "Invoking %.17s ...", command);
     strcpy (tmp, command);
     r = Tcl_Eval (interp, tmp);
     if (r == TCL_ERROR)
@@ -294,13 +408,21 @@ int IrTcl_eval (Tcl_Interp *interp, const char *command)
 /*
  * IrTcl_getRecordSyntaxStr: Return record syntax name of object id
  */
-static const char *IrTcl_getRecordSyntaxStr (enum oid_value value)
+static 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";
+    int *o;
+    struct oident ent, *entp;
+
+    ent.proto = PROTO_Z3950;
+    ent.oclass = CLASS_RECSYN;
+    ent.value = value;
+
+    o = oid_getoidbyent (&ent);
+    entp = oid_getentbyoid (o);
+    
+    if (!entp)
+        return "";
+    return entp->desc;
 }
 
 /*
@@ -308,11 +430,7 @@ static const char *IrTcl_getRecordSyntaxStr (enum oid_value value)
  */
 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;
+    return oid_getvalbyname (name);
 }
 
 static IrTcl_RecordList *find_IR_record (IrTcl_SetObj *setobj, int no)
@@ -320,7 +438,9 @@ 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)
+        if (no == rl->no && 
+            (!setobj->recordElements || !rl->elements || 
+             !strcmp (setobj->recordElements, rl->elements)))
             return rl;
     return NULL;
 }
@@ -331,26 +451,17 @@ static void delete_IR_records (IrTcl_SetObj *setobj)
 
     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);
+        delete_IR_record (rl);
+        rl1 = rl->next;
+        free (rl);
     }
     setobj->record_list = NULL;
 }
 
 /*
- * get_set_int: Set/get integer value
+ * ir_tcl_get_set_int: Set/get integer value
  */
-static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
+int ir_tcl_get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
 {
     char buf[20];
     
@@ -365,61 +476,46 @@ static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
 }
 
 /*
- * ir_method: Search for method in table and invoke method handler
+ * ir_tcl_method: Search for method in table and invoke method handler
  */
-int ir_method (Tcl_Interp *interp, int argc, char **argv, IrTcl_Methods *tab)
+int ir_tcl_method (Tcl_Interp *interp, int argc, char **argv,
+                   IrTcl_Methods *tab, int *ret)
 {
     IrTcl_Methods *tab_i = tab;
     IrTcl_Method *t;
 
     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;
+            if (argc <= 0)
+            {
+                if ((*t->method)(tab_i->obj, interp, argc, argv) == TCL_ERROR)
+                    return TCL_ERROR;
             }
-	    else
+            else
                 if (!strcmp (t->name, argv[1]))
-                    return (*t->method)(tab_i->obj, interp, argc, argv);
+                {
+                    *ret = (*t->method)(tab_i->obj, interp, argc, argv);
+                    return TCL_OK;
+                }
 
     if (argc <= 0)
         return TCL_OK;
+#if 0
     Tcl_AppendResult (interp, "Bad method: ", argv[1], 
                       ". 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);
+#endif
+    *ret = TCL_ERROR;
     return TCL_ERROR;
 }
 
 /*
- * ir_method_r: Get status for all readable elements
- */
-int ir_method_r (void *obj, Tcl_Interp *interp, int argc, char **argv,
-                 IrTcl_Method *tab)
-{
-    char *argv_n[3];
-    int argc_n;
-
-    argv_n[0] = argv[0];
-    argc_n = 2;
-    for (; tab->name; tab++)
-        if (tab->type)
-        {
-            argv_n[1] = tab->name;
-            Tcl_AppendResult (interp, "{", NULL);
-            (*tab->method)(obj, interp, argc_n, argv_n);
-            Tcl_AppendResult (interp, "} ", NULL);
-        }
-    return TCL_OK;
-}
-
-/*
- *  ir_named_bits: get/set named bits
+ *  ir_tcl_named_bits: get/set named bits
  */
-int ir_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob,
-                   Tcl_Interp *interp, int argc, char **argv)
+int ir_tcl_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob,
+                       Tcl_Interp *interp, int argc, char **argv)
 {
     struct ir_named_entry *ti;
     if (argc > 0)
@@ -455,9 +551,9 @@ static void set_referenceId (ODR o, Z_ReferenceId **dst, const char *src)
     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);
+        (*dst)->size = (*dst)->len = strlen(src);
+        (*dst)->buf = odr_malloc (o, (*dst)->len);
+        memcpy ((*dst)->buf, src, (*dst)->len);
     }
 }
 
@@ -467,7 +563,7 @@ static void get_referenceId (char **dst, Z_ReferenceId *src)
     if (!src)
     {
         *dst = NULL;
-	return;
+        return;
     }
     *dst = ir_tcl_malloc (src->len+1);
     memcpy (*dst, src->buf, src->len);
@@ -507,6 +603,8 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
         Z_IdPass *pass = odr_malloc (p->odr_out, sizeof(*pass));
         Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
 
+        logf (LOG_DEBUG, "using pass authentication");
+
         auth->which = Z_IdAuthentication_idPass;
         auth->u.idPass = pass;
         if (p->idAuthenticationGroupId && *p->idAuthenticationGroupId)
@@ -529,6 +627,7 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
     {
         Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
 
+        logf (LOG_DEBUG, "using open authentication");
         auth->which = Z_IdAuthentication_open;
         auth->u.open = p->idAuthenticationOpen;
         req->idAuthentication = auth;
@@ -538,7 +637,7 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
     req->implementationVersion = p->implementationVersion;
     req->userInformationField = 0;
 
-    return ir_tcl_send_APDU (interp, p, apdu, "init", argv[0]);
+    return ir_tcl_send_APDU (interp, p, apdu, "init", *argv);
 }
 
 /*
@@ -554,8 +653,8 @@ static int do_protocolVersion (void *obj, Tcl_Interp *interp,
     if (argc <= 0)
     {
         ODR_MASK_ZERO (&p->protocolVersion);
-	ODR_MASK_SET (&p->protocolVersion, 0);
-	ODR_MASK_SET (&p->protocolVersion, 1);
+        ODR_MASK_SET (&p->protocolVersion, 0);
+        ODR_MASK_SET (&p->protocolVersion, 1);
         return TCL_OK;
     }
     if (argc == 3)
@@ -602,14 +701,62 @@ static int do_options (void *obj, Tcl_Interp *interp,
     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, 0);
+        ODR_MASK_SET (&p->options, 1);
         ODR_MASK_SET (&p->options, 4);
-	ODR_MASK_SET (&p->options, 7);
-	ODR_MASK_SET (&p->options, 14);
-	return TCL_OK;
+        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);
+    return ir_tcl_named_bits (options_tab, &p->options, interp, argc-2, argv+2);
+}
+
+/*
+ * do_apduInfo: Get APDU information
+ */
+static int do_apduInfo (void *obj, Tcl_Interp *interp, int argc, char **argv)
+{
+    char buf[16];
+    FILE *apduf;
+    IrTcl_Obj *p = obj;
+
+    if (argc <= 0)
+        return TCL_OK;
+    sprintf (buf, "%d", p->apduLen);
+    Tcl_AppendElement (interp, buf);
+    sprintf (buf, "%d", p->apduOffset);
+    Tcl_AppendElement (interp, buf);
+    if (!p->buf_in)
+    {
+        Tcl_AppendElement (interp, "");
+        return TCL_OK;
+    }
+    apduf = fopen ("apdu.tmp", "w");
+    if (!apduf)
+    {
+        Tcl_AppendElement (interp, "");
+        return TCL_OK;
+    }
+    odr_dumpBER (apduf, p->buf_in, p->apduLen);
+    fclose (apduf);
+    if (!(apduf = fopen ("apdu.tmp", "r")))
+        Tcl_AppendElement (interp, "");
+    else
+    {
+        int c;
+        
+        Tcl_AppendResult (interp, " {", NULL);
+        while ((c = getc (apduf)) != EOF)
+        {
+            buf[0] = c;
+            buf[1] = '\0';
+            Tcl_AppendResult (interp, buf, NULL);
+        }
+        fclose (apduf);
+        Tcl_AppendResult (interp, "}", NULL);
+    }
+    unlink ("apdu.tmp");
+    return TCL_OK;
 }
 
 /*
@@ -623,7 +770,7 @@ static int do_failInfo (void *obj, Tcl_Interp *interp, int argc, char **argv)
     if (argc <= 0)
     {
         p->failInfo = 0;
-	return TCL_OK;
+        return TCL_OK;
     }
     sprintf (buf, "%d", p->failInfo);
     switch (p->failInfo)
@@ -665,9 +812,9 @@ static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
     if (argc <= 0)
     {
         p->preferredMessageSize = 30000;
-	return TCL_OK;
+        return TCL_OK;
     }
-    return get_set_int (&p->preferredMessageSize, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->preferredMessageSize, interp, argc, argv);
 }
 
 /*
@@ -681,9 +828,9 @@ static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
     if (argc <= 0)
     {
         p->maximumRecordSize = 30000;
-	return TCL_OK;
+        return TCL_OK;
     }
-    return get_set_int (&p->maximumRecordSize, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->maximumRecordSize, interp, argc, argv);
 }
 
 /*
@@ -696,7 +843,7 @@ static int do_initResult (void *obj, Tcl_Interp *interp,
    
     if (argc <= 0)
         return TCL_OK;
-    return get_set_int (&p->initResult, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->initResult, interp, argc, argv);
 }
 
 
@@ -768,7 +915,7 @@ static int do_targetImplementationName (void *obj, Tcl_Interp *interp,
     if (argc == 0)
     {
         p->targetImplementationName = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
         return ir_tcl_strdel (interp, &p->targetImplementationName);
@@ -787,7 +934,7 @@ static int do_targetImplementationId (void *obj, Tcl_Interp *interp,
     if (argc == 0)
     {
         p->targetImplementationId = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
         return ir_tcl_strdel (interp, &p->targetImplementationId);
@@ -806,7 +953,7 @@ static int do_targetImplementationVersion (void *obj, Tcl_Interp *interp,
     if (argc == 0)
     {
         p->targetImplementationVersion = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
         return ir_tcl_strdel (interp, &p->targetImplementationVersion);
@@ -842,19 +989,23 @@ static int do_idAuthentication (void *obj, Tcl_Interp *interp,
     {
         if (argc == 3)
         {
-            if (ir_tcl_strdup (interp, &p->idAuthenticationOpen, argv[2])
+            if (argv[2][0] && 
+                ir_tcl_strdup (interp, &p->idAuthenticationOpen, argv[2])
                 == TCL_ERROR)
                 return TCL_ERROR;
         }
         else if (argc == 5)
         {
-            if (ir_tcl_strdup (interp, &p->idAuthenticationGroupId, argv[2])
+            if (argv[2][0] && 
+                ir_tcl_strdup (interp, &p->idAuthenticationGroupId, argv[2])
                 == TCL_ERROR)
                 return TCL_ERROR;
-            if (ir_tcl_strdup (interp, &p->idAuthenticationUserId, argv[3])
+            if (argv[3][0] && 
+                ir_tcl_strdup (interp, &p->idAuthenticationUserId, argv[3])
                 == TCL_ERROR)
                 return TCL_ERROR;
-            if (ir_tcl_strdup (interp, &p->idAuthenticationPassword, argv[4])
+            if (argv[4][0] &&
+                ir_tcl_strdup (interp, &p->idAuthenticationPassword, argv[4])
                 == TCL_ERROR)
                 return TCL_ERROR;
         }
@@ -874,7 +1025,7 @@ static int do_idAuthentication (void *obj, Tcl_Interp *interp,
  * do_connect: connect method on IR object
  */
 static int do_connect (void *obj, Tcl_Interp *interp,
-		       int argc, char **argv)
+                       int argc, char **argv)
 {
     void *addr;
     IrTcl_Obj *p = obj;
@@ -889,7 +1040,7 @@ static int do_connect (void *obj, Tcl_Interp *interp,
             interp->result = "already connected";
             return TCL_ERROR;
         }
-        if (!strcmp (p->cs_type, "tcpip"))
+        if (!strcmp (p->comstackType, "tcpip"))
         {
             p->cs_link = cs_create (tcpip_type, CS_BLOCK, p->protocol_type);
             addr = tcpip_strtoaddr (argv[2]);
@@ -900,7 +1051,7 @@ static int do_connect (void *obj, Tcl_Interp *interp,
             }
             logf (LOG_DEBUG, "tcp/ip connect %s", argv[2]);
         }
-        else if (!strcmp (p->cs_type, "mosi"))
+        else if (!strcmp (p->comstackType, "mosi"))
         {
 #if MOSI
             p->cs_link = cs_create (mosi_type, CS_BLOCK, p->protocol_type);
@@ -919,72 +1070,116 @@ static int do_connect (void *obj, Tcl_Interp *interp,
         else 
         {
             Tcl_AppendResult (interp, "Bad comstack type: ", 
-                              p->cs_type, NULL);
+                              p->comstackType, NULL);
             return TCL_ERROR;
         }
         if (ir_tcl_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
             return TCL_ERROR;
+#if IRTCL_GENERIC_FILES
+#ifdef WINDOWS
+        p->csFile = Tcl_GetFile (cs_fileno(p->cs_link), TCL_WIN_SOCKET);
+#else
+        p->csFile = Tcl_GetFile (cs_fileno(p->cs_link), TCL_UNIX_FD);
+#endif
+#endif
         if ((r=cs_connect (p->cs_link, addr)) < 0)
         {
             interp->result = "connect fail";
-            do_disconnect (p, NULL, 2, NULL);
+            ir_tcl_disconnect (p);
             return TCL_ERROR;
         }
+	logf(LOG_DEBUG, "cs_connect() returned %d fd=%d", r,
+             cs_fileno(p->cs_link));
+        p->eventType = "connect";
+#if IRTCL_GENERIC_FILES
+        ir_select_add (p->csFile, p);
+#else
         ir_select_add (cs_fileno (p->cs_link), p);
+#endif
         if (r == 1)
         {
+#if IRTCL_GENERIC_FILES
+            ir_select_add_write (p->csFile, p);
+#else
             ir_select_add_write (cs_fileno (p->cs_link), p);
+#endif
             p->state = IR_TCL_R_Connecting;
         }
         else
         {
             p->state = IR_TCL_R_Idle;
             if (p->callback)
-                IrTcl_eval (p->interp, p->callback);
+                ir_tcl_eval (p->interp, p->callback);
         }
     }
+    else
+        Tcl_AppendResult (interp, p->hostname, NULL);
     return TCL_OK;
 }
 
-/*
- * do_disconnect: disconnect method on IR object
+/* 
+ * ir_tcl_disconnect: close connection
  */
-static int do_disconnect (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
+void ir_tcl_disconnect (IrTcl_Obj *p)
 {
-    IrTcl_Obj *p = obj;
-
-    if (argc == 0)
-    {
-        p->state = IR_TCL_R_Idle;
-        p->hostname = NULL;
-	p->cs_link = NULL;
-        return TCL_OK;
-    }
     if (p->hostname)
     {
+	logf(LOG_DEBUG, "Closing connection to %s", p->hostname);
         free (p->hostname);
         p->hostname = NULL;
+#if IRTCL_GENERIC_FILES
+        ir_select_remove_write (p->csFile, p);
+        ir_select_remove (p->csFile, p);
+#else
         ir_select_remove_write (cs_fileno (p->cs_link), p);
         ir_select_remove (cs_fileno (p->cs_link), p);
+#endif
+
+        odr_reset (p->odr_in);
 
         assert (p->cs_link);
         cs_close (p->cs_link);
         p->cs_link = NULL;
+#if IRTCL_GENERIC_FILES
+        Tcl_FreeFile (p->csFile);
+        p->csFile = NULL;
+#endif
 
         ODR_MASK_ZERO (&p->options);
-	ODR_MASK_SET (&p->options, 0);
-	ODR_MASK_SET (&p->options, 1);
-	ODR_MASK_SET (&p->options, 4);
-	ODR_MASK_SET (&p->options, 7);
-	ODR_MASK_SET (&p->options, 14);
+        ODR_MASK_SET (&p->options, 0);
+        ODR_MASK_SET (&p->options, 1);
+        ODR_MASK_SET (&p->options, 4);
+        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);
+        ODR_MASK_SET (&p->protocolVersion, 0);
+        ODR_MASK_SET (&p->protocolVersion, 1);
         ir_tcl_del_q (p);
     }
     assert (!p->cs_link);
+}
+
+/*
+ * do_disconnect: disconnect method on IR object
+ */
+static int do_disconnect (void *obj, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+    {
+        p->state = IR_TCL_R_Idle;
+        p->eventType = NULL;
+        p->hostname = NULL;
+        p->cs_link = NULL;
+#if IRTCL_GENERIC_FILES
+        p->csFile = 0;
+#endif
+        return TCL_OK;
+    }
+    ir_tcl_disconnect (p);
     return TCL_OK;
 }
 
@@ -992,21 +1187,21 @@ static int do_disconnect (void *obj, Tcl_Interp *interp,
  * do_comstack: Set/get comstack method on IR object
  */
 static int do_comstack (void *o, Tcl_Interp *interp,
-		        int argc, char **argv)
+                        int argc, char **argv)
 {
     IrTcl_Obj *obj = o;
 
     if (argc == 0)
-        return ir_tcl_strdup (interp, &obj->cs_type, "tcpip");
+        return ir_tcl_strdup (interp, &obj->comstackType, "tcpip");
     else if (argc == -1)
-        return ir_tcl_strdel (interp, &obj->cs_type);
+        return ir_tcl_strdel (interp, &obj->comstackType);
     else if (argc == 3)
     {
-        free (obj->cs_type);
-        if (ir_tcl_strdup (interp, &obj->cs_type, argv[2]) == TCL_ERROR)
+        free (obj->comstackType);
+        if (ir_tcl_strdup (interp, &obj->comstackType, argv[2]) == TCL_ERROR)
             return TCL_ERROR;
     }
-    Tcl_AppendElement (interp, obj->cs_type);
+    Tcl_AppendElement (interp, obj->comstackType);
     return TCL_OK;
 }
 
@@ -1029,31 +1224,48 @@ static int do_logLevel (void *o, Tcl_Interp *interp,
 
 
 /*
+ * do_eventType: Return type of last event
+ */
+static int do_eventType (void *obj, Tcl_Interp *interp,
+                         int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc <= 0)
+    {
+        p->eventType = NULL;
+        return TCL_OK;
+    }
+    Tcl_AppendElement (interp, p->eventType ? p->eventType : "");
+    return TCL_OK;
+}
+
+
+/*
  * do_callback: add callback
  */
 static int do_callback (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
+                        int argc, char **argv)
 {
     IrTcl_Obj *p = obj;
 
     if (argc == 0)
     {
         p->callback = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
         return ir_tcl_strdel (interp, &p->callback);
     if (argc == 3)
     {
         free (p->callback);
-	if (argv[2][0])
-	{
+        if (argv[2][0])
+        {
             if (ir_tcl_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)
                 return TCL_ERROR;
-	}
-	else
-	    p->callback = NULL;
-        p->interp = interp;
+        }
+        else
+            p->callback = NULL;
     }
     return TCL_OK;
 }
@@ -1069,26 +1281,53 @@ static int do_failback (void *obj, Tcl_Interp *interp,
     if (argc == 0)
     {
         p->failback = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
         return ir_tcl_strdel (interp, &p->failback);
     else if (argc == 3)
     {
         free (p->failback);
-	if (argv[2][0])
-	{
+        if (argv[2][0])
+        {
             if (ir_tcl_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
                 return TCL_ERROR;
-	}
-	else
-	    p->failback = NULL;
-        p->interp = interp;
+        }
+        else
+            p->failback = NULL;
     }
     return TCL_OK;
 }
 
 /*
+ * do_initResponse: add init response handler
+ */
+static int do_initResponse (void *obj, Tcl_Interp *interp,
+                            int argc, char **argv)
+{
+    IrTcl_Obj *p = obj;
+
+    if (argc == 0)
+    {
+        p->initResponse = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &p->initResponse);
+    if (argc == 3)
+    {
+        free (p->initResponse);
+        if (argv[2][0])
+        {
+            if (ir_tcl_strdup (interp, &p->initResponse, argv[2]) == TCL_ERROR)
+                return TCL_ERROR;
+        }
+        else
+            p->initResponse = NULL;
+    }
+    return TCL_OK;
+}
+/*
  * do_protocol: Set/get protocol method on IR object
  */
 static int do_protocol (void *o, Tcl_Interp *interp, int argc, char **argv)
@@ -1170,8 +1409,8 @@ static int do_databaseNames (void *obj, Tcl_Interp *interp,
     if (argc <= 0)
     {
         p->num_databaseNames = 0;
-	p->databaseNames = NULL;
-	return TCL_OK;
+        p->databaseNames = NULL;
+        return TCL_OK;
     }
     if (argc < 3)
     {
@@ -1187,13 +1426,14 @@ static int do_databaseNames (void *obj, Tcl_Interp *interp,
     }
     p->num_databaseNames = argc - 2;
     p->databaseNames =
-        ir_tcl_malloc (sizeof(*p->databaseNames) * p->num_databaseNames);
+        ir_tcl_malloc (sizeof(*p->databaseNames) * (1+p->num_databaseNames));
     for (i=0; i<p->num_databaseNames; i++)
     {
         if (ir_tcl_strdup (interp, &p->databaseNames[i], argv[2+i]) 
             == TCL_ERROR)
             return TCL_ERROR;
     }
+    p->databaseNames[i] = NULL;
     return TCL_OK;
 }
 
@@ -1208,16 +1448,16 @@ static int do_replaceIndicator (void *obj, Tcl_Interp *interp,
     if (argc <= 0)
     {
         p->replaceIndicator = 1;
-	return TCL_OK;
+        return TCL_OK;
     }
-    return get_set_int (&p->replaceIndicator, interp, argc, argv);
+    return ir_tcl_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)
+                       int argc, char **argv)
 {
     IrTcl_SetCObj *p = obj;
 
@@ -1246,7 +1486,7 @@ static int do_userInformationField (void *obj, Tcl_Interp *interp,
     if (argc == 0)
     {
         p->userInformationField = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
         return ir_tcl_strdel (interp, &p->userInformationField);
@@ -1258,16 +1498,16 @@ static int do_userInformationField (void *obj, Tcl_Interp *interp,
  * do_smallSetUpperBound: Set/get small set upper bound
  */
 static int do_smallSetUpperBound (void *o, Tcl_Interp *interp,
-		       int argc, char **argv)
+                       int argc, char **argv)
 {
     IrTcl_SetCObj *p = o;
 
     if (argc <= 0)
     {
         p->smallSetUpperBound = 0;
-	return TCL_OK;
+        return TCL_OK;
     }
-    return get_set_int (&p->smallSetUpperBound, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->smallSetUpperBound, interp, argc, argv);
 }
 
 /*
@@ -1281,9 +1521,9 @@ static int do_largeSetLowerBound (void *o, Tcl_Interp *interp,
     if (argc <= 0)
     {
         p->largeSetLowerBound = 2;
-	return TCL_OK;
+        return TCL_OK;
     }
-    return get_set_int (&p->largeSetLowerBound, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->largeSetLowerBound, interp, argc, argv);
 }
 
 /*
@@ -1297,16 +1537,16 @@ static int do_mediumSetPresentNumber (void *o, Tcl_Interp *interp,
     if (argc <= 0)
     {
         p->mediumSetPresentNumber = 0;
-	return TCL_OK;
+        return TCL_OK;
     }
-    return get_set_int (&p->mediumSetPresentNumber, interp, argc, argv);
+    return ir_tcl_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)
+                           int argc, char **argv)
 {
     IrTcl_SetCObj *p = obj;
 
@@ -1354,48 +1594,137 @@ static int do_preferredRecordSyntax (void *obj, Tcl_Interp *interp,
                            ir_tcl_malloc (sizeof(*p->preferredRecordSyntax))))
             *p->preferredRecordSyntax = IrTcl_getRecordSyntaxVal (argv[2]);
     }
+    else if (argc == 2)
+    {
+        Tcl_AppendElement (interp, IrTcl_getRecordSyntaxStr
+                           (*p->preferredRecordSyntax));
+    }
     return TCL_OK;
             
 }
 
+/*
+ * do_elementSetNames: Set/Get element Set Names
+ */
+static int do_elementSetNames (void *obj, Tcl_Interp *interp,
+                               int argc, char **argv)
+{
+    IrTcl_SetCObj *p = obj;
+
+    if (argc == 0)
+    {
+        p->elementSetNames = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &p->elementSetNames);
+    if (argc == 3)
+    {
+        free (p->elementSetNames);
+        if (ir_tcl_strdup (interp, &p->elementSetNames, argv[2]) == TCL_ERROR)
+            return TCL_ERROR;
+    }
+    Tcl_AppendResult (interp, p->elementSetNames, NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_smallSetElementSetNames: Set/Get small Set Element Set Names
+ */
+static int do_smallSetElementSetNames (void *obj, Tcl_Interp *interp,
+                               int argc, char **argv)
+{
+    IrTcl_SetCObj *p = obj;
+
+    if (argc == 0)
+    {
+        p->smallSetElementSetNames = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &p->smallSetElementSetNames);
+    if (argc == 3)
+    {
+        free (p->smallSetElementSetNames);
+        if (ir_tcl_strdup (interp, &p->smallSetElementSetNames,
+                           argv[2]) == TCL_ERROR)
+            return TCL_ERROR;
+    }
+    Tcl_AppendResult (interp, p->smallSetElementSetNames, NULL);
+    return TCL_OK;
+}
+
+/*
+ * do_mediumSetElementSetNames: Set/Get medium Set Element Set Names
+ */
+static int do_mediumSetElementSetNames (void *obj, Tcl_Interp *interp,
+                               int argc, char **argv)
+{
+    IrTcl_SetCObj *p = obj;
+
+    if (argc == 0)
+    {
+        p->mediumSetElementSetNames = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &p->mediumSetElementSetNames);
+    if (argc == 3)
+    {
+        free (p->mediumSetElementSetNames);
+        if (ir_tcl_strdup (interp, &p->mediumSetElementSetNames,
+                           argv[2]) == TCL_ERROR)
+            return TCL_ERROR;
+    }
+    Tcl_AppendResult (interp, p->mediumSetElementSetNames, NULL);
+    return TCL_OK;
+}
+
 static IrTcl_Method ir_method_tab[] = {
-{ 1, "comstack",                    do_comstack },
-{ 1, "protocol",                    do_protocol },
-{ 0, "failback",                    do_failback },
-{ 0, "failInfo",                    do_failInfo },
-{ 0, "logLevel",                    do_logLevel },
-
-{ 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, "triggerResourceControl",      do_triggerResourceControl },
-{ 0, NULL, NULL}
+{ "comstack",                    do_comstack, NULL },
+{ "protocol",                    do_protocol, NULL },
+{ "failback",                    do_failback, NULL },
+{ "failInfo",                    do_failInfo, NULL },
+{ "apduInfo",                    do_apduInfo, NULL },
+{ "logLevel",                    do_logLevel, NULL },
+
+{ "eventType",                   do_eventType, NULL },
+{ "connect",                     do_connect, NULL },
+{ "protocolVersion",             do_protocolVersion, NULL },
+{ "preferredMessageSize",        do_preferredMessageSize, NULL },
+{ "maximumRecordSize",           do_maximumRecordSize, NULL },
+{ "implementationName",          do_implementationName, NULL },
+{ "implementationId",            do_implementationId, NULL },
+{ "implementationVersion",       do_implementationVersion, NULL },
+{ "targetImplementationName",    do_targetImplementationName, NULL },
+{ "targetImplementationId",      do_targetImplementationId, NULL },
+{ "targetImplementationVersion", do_targetImplementationVersion, NULL},
+{ "userInformationField",        do_userInformationField, NULL},
+{ "idAuthentication",            do_idAuthentication, NULL},
+{ "options",                     do_options, NULL},
+{ "init",                        do_init_request, NULL},
+{ "initResult",                  do_initResult, NULL},
+{ "disconnect",                  do_disconnect, NULL},
+{ "callback",                    do_callback, NULL},
+{ "initResponse",                do_initResponse, NULL},
+{ "triggerResourceControl",      do_triggerResourceControl, NULL},
+{ "initResponse",                do_initResponse, NULL},
+{ 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}
+{ "databaseNames",               do_databaseNames, NULL},
+{ "replaceIndicator",            do_replaceIndicator, NULL},
+{ "queryType",                   do_queryType, NULL},
+{ "preferredRecordSyntax",       do_preferredRecordSyntax, NULL},
+{ "smallSetUpperBound",          do_smallSetUpperBound, NULL},
+{ "largeSetLowerBound",          do_largeSetLowerBound, NULL},
+{ "mediumSetPresentNumber",      do_mediumSetPresentNumber, NULL},
+{ "referenceId",                 do_referenceId, NULL},
+{ "elementSetNames",             do_elementSetNames, NULL},
+{ "smallSetElementSetNames",     do_smallSetElementSetNames, NULL},
+{ "mediumSetElementSetNames",    do_mediumSetElementSetNames, NULL},
+{ NULL, NULL}
 };
 
 /* 
@@ -1406,17 +1735,19 @@ static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
 {
     IrTcl_Methods tab[3];
     IrTcl_Obj *p = clientData;
+    int r;
 
     if (argc < 2)
-        return ir_method_r (clientData, interp, argc, argv, ir_method_tab);
-
+        return TCL_ERROR;
+    
     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);
+    
+    ir_tcl_method (interp, argc, argv, tab, &r);
+    return r;
 }
 
 /* 
@@ -1439,7 +1770,7 @@ static void ir_obj_delete (ClientData clientData)
     tab[1].obj = &obj->set_inher;
     tab[2].tab = NULL;
 
-    ir_method (NULL, -1, NULL, tab);
+    ir_tcl_method (NULL, -1, NULL, tab, NULL);
 
     ir_tcl_del_q (obj);
     odr_destroy (obj->odr_in);
@@ -1449,10 +1780,11 @@ static void ir_obj_delete (ClientData clientData)
 }
 
 /* 
- * ir_obj_mk: IR Object creation
+ * ir_obj_init: IR Object initialization
  */
-static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
-                      int argc, char **argv)
+int ir_obj_init (ClientData clientData, Tcl_Interp *interp,
+                 int argc, char **argv, ClientData *subData,
+                 ClientData parentData)
 {
     IrTcl_Methods tab[3];
     IrTcl_Obj *obj;
@@ -1471,16 +1803,17 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     obj->bibset = ccl_qual_mk (); 
     if ((inf = fopen ("default.bib", "r")))
     {
-    	ccl_qual_file (obj->bibset, inf);
-    	fclose (inf);
+        ccl_qual_file (obj->bibset, inf);
+        fclose (inf);
     }
 #endif
 
-    logf (LOG_DEBUG, "ir object create");
+    logf (LOG_DEBUG, "ir object create %s", argv[1]);
     obj->odr_in = odr_createmem (ODR_DECODE);
     obj->odr_out = odr_createmem (ODR_ENCODE);
     obj->odr_pr = odr_createmem (ODR_PRINT);
     obj->state = IR_TCL_R_Idle;
+    obj->interp = interp;
 
     obj->len_in = 0;
     obj->buf_in = NULL;
@@ -1492,13 +1825,40 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     tab[1].obj = &obj->set_inher;
     tab[2].tab = NULL;
 
-    if (ir_method (interp, 0, NULL, tab) == TCL_ERROR)
+    if (ir_tcl_method (interp, 0, NULL, tab, NULL) == TCL_ERROR)
+    {
+        Tcl_AppendResult (interp, "Failed to initialize ", argv[1], NULL);
+        return TCL_ERROR;
+    }
+    *subData = obj;
+    return TCL_OK;
+}
+
+
+/* 
+ * ir_obj_mk: IR Object creation
+ */
+static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
+                      int argc, char **argv)
+{
+    ClientData subData;
+    int r = ir_obj_init (clientData, interp, argc, argv, &subData, 0);
+    
+    if (r == TCL_ERROR)
         return TCL_ERROR;
     Tcl_CreateCommand (interp, argv[1], ir_obj_method,
-                       (ClientData) obj, ir_obj_delete);
+                       subData, ir_obj_delete);
     return TCL_OK;
 }
 
+IrTcl_Class ir_obj_class = {
+    "ir",
+    ir_obj_init,
+    ir_obj_method,
+    ir_obj_delete
+};
+
+
 /* ------------------------------------------------------- */
 /*
  * do_search: Do search request
@@ -1536,8 +1896,10 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
     apdu = zget_APDU (p->odr_out, Z_APDU_searchRequest);
     req = apdu->u.searchRequest;
 
+    obj->start = 1;
+
     bib1.proto = p->protocol_type;
-    bib1.class = CLASS_ATTSET;
+    bib1.oclass = CLASS_ATTSET;
     bib1.value = VAL_BIB1;
 
     set_referenceId (p->odr_out, &req->referenceId,
@@ -1553,14 +1915,12 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
     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.oclass = CLASS_RECSYN;
         ident.value = *obj->set_inher.preferredRecordSyntax;
         logf (LOG_DEBUG, "Preferred record syntax is %d", ident.value);
         req->preferredRecordSyntax = odr_oiddup (p->odr_out, 
@@ -1568,15 +1928,40 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
     else
         req->preferredRecordSyntax = 0;
-    req->query = &query;
 
+    if (obj->set_inher.smallSetElementSetNames &&
+        *obj->set_inher.smallSetElementSetNames)
+    {
+        Z_ElementSetNames *esn = odr_malloc (p->odr_out, sizeof(*esn));
+        
+        esn->which = Z_ElementSetNames_generic;
+        esn->u.generic = obj->set_inher.smallSetElementSetNames;
+        req->smallSetElementSetNames = esn;
+    }
+    else
+        req->smallSetElementSetNames = NULL; 
+    
+    if (obj->set_inher.mediumSetElementSetNames &&
+        *obj->set_inher.mediumSetElementSetNames)
+    {
+        Z_ElementSetNames *esn = odr_malloc (p->odr_out, sizeof(*esn));
+        
+        esn->which = Z_ElementSetNames_generic;
+        esn->u.generic = obj->set_inher.mediumSetElementSetNames;
+        req->mediumSetElementSetNames = esn;
+    }
+    else
+        req->mediumSetElementSetNames = NULL; 
+    
+    req->query = &query;
+    
     if (!strcmp (obj->set_inher.queryType, "rpn"))
     {
         Z_RPNQuery *RPNquery;
 
         RPNquery = p_query_rpn (p->odr_out, argv[2]);
-	if (!RPNquery)
-	{
+        if (!RPNquery)
+        {
             Tcl_AppendResult (interp, "Syntax error in query", NULL);
             return TCL_ERROR;
         }
@@ -1597,7 +1982,7 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
         if (error)
         {
             Tcl_AppendResult (interp, "CCL error: ", 
-	                      ccl_err_msg(error), NULL);
+                              ccl_err_msg(error), NULL);
             return TCL_ERROR;
         }
         ccl_pr_tree (rpn, stderr);
@@ -1608,60 +1993,123 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
         query.u.type_1 = RPNquery;
         logf (LOG_DEBUG, "CCLRPN");
     }
-#endif
-    else if (!strcmp (obj->set_inher.queryType, "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]);
+        logf (LOG_DEBUG, "CCL");
+    }
+    else
+    {
+        interp->result = "unknown query method";
+        return TCL_ERROR;
+    }
+    return ir_tcl_send_APDU (interp, p, apdu, "search", *argv);
+}
+
+/*
+ * do_searchResponse: add search response handler
+ */
+static int do_searchResponse (void *o, Tcl_Interp *interp,
+                              int argc, char **argv)
+{
+    IrTcl_SetObj *obj = o;
+
+    if (argc == 0)
+    {
+        obj->searchResponse = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &obj->searchResponse);
+    if (argc == 3)
+    {
+        free (obj->searchResponse);
+        if (argv[2][0])
+        {
+            if (ir_tcl_strdup (interp, &obj->searchResponse, argv[2])
+                == TCL_ERROR)
+                return TCL_ERROR;
+        }
+        else
+            obj->searchResponse = NULL;
+    }
+    return TCL_OK;
+}
+
+/*
+ * do_presentResponse: add present response handler
+ */
+static int do_presentResponse (void *o, Tcl_Interp *interp,
+                               int argc, char **argv)
+{
+    IrTcl_SetObj *obj = o;
+
+    if (argc == 0)
     {
-        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]);
-        logf (LOG_DEBUG, "CCL");
+        obj->presentResponse = NULL;
+        return TCL_OK;
     }
-    else
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &obj->presentResponse);
+    if (argc == 3)
     {
-        interp->result = "unknown query method";
-        return TCL_ERROR;
+        free (obj->presentResponse);
+        if (argv[2][0])
+        {
+            if (ir_tcl_strdup (interp, &obj->presentResponse, argv[2])
+                == TCL_ERROR)
+                return TCL_ERROR;
+        }
+        else
+            obj->presentResponse = NULL;
     }
-    return ir_tcl_send_APDU (interp, p, apdu, "search", argv[0]);
+    return TCL_OK;
 }
 
 /*
  * do_resultCount: Get number of hits
  */
 static int do_resultCount (void *o, Tcl_Interp *interp,
-		       int argc, char **argv)
+                       int argc, char **argv)
 {
     IrTcl_SetObj *obj = o;
 
     if (argc <= 0)
+    {
+        obj->resultCount = 0;
         return TCL_OK;
-    return get_set_int (&obj->resultCount, interp, argc, argv);
+    }
+    return ir_tcl_get_set_int (&obj->resultCount, interp, argc, argv);
 }
 
 /*
  * do_searchStatus: Get search status (after search response)
  */
 static int do_searchStatus (void *o, Tcl_Interp *interp,
-		            int argc, char **argv)
+                            int argc, char **argv)
 {
     IrTcl_SetObj *obj = o;
 
     if (argc <= 0)
         return TCL_OK;
-    return get_set_int (&obj->searchStatus, interp, argc, argv);
+    return ir_tcl_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)
+                            int argc, char **argv)
 {
     IrTcl_SetObj *obj = o;
 
     if (argc <= 0)
         return TCL_OK;
-    return get_set_int (&obj->presentStatus, interp, argc, argv);
+    return ir_tcl_get_set_int (&obj->presentStatus, interp, argc, argv);
 }
 
 /*
@@ -1678,14 +2126,15 @@ static int do_nextResultSetPosition (void *o, Tcl_Interp *interp,
         obj->nextResultSetPosition = 0;
         return TCL_OK;
     }
-    return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);
+    return ir_tcl_get_set_int (&obj->nextResultSetPosition, interp,
+                               argc, argv);
 }
 
 /*
  * do_setName: Set result Set name
  */
 static int do_setName (void *o, Tcl_Interp *interp,
-		       int argc, char **argv)
+                       int argc, char **argv)
 {
     IrTcl_SetObj *obj = o;
 
@@ -1717,7 +2166,8 @@ static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
         obj->numberOfRecordsReturned = 0;
         return TCL_OK;
     }
-    return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
+    return ir_tcl_get_set_int (&obj->numberOfRecordsReturned, interp,
+                               argc, argv);
 }
 
 /*
@@ -1732,14 +2182,14 @@ static int do_type (void *o, Tcl_Interp *interp, int argc, char **argv)
     if (argc == 0)
     {
         obj->record_list = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
     {
         delete_IR_records (obj);
-	return TCL_OK;
+        return TCL_OK;
     }
-    if (argc < 3)
+    if (argc != 3)
     {
         sprintf (interp->result, "wrong # args");
         return TCL_ERROR;
@@ -1748,7 +2198,10 @@ static int do_type (void *o, Tcl_Interp *interp, int argc, char **argv)
         return TCL_ERROR;
     rl = find_IR_record (obj, offset);
     if (!rl)
+    {
+        logf (LOG_DEBUG, "No record at position %d", offset);
         return TCL_OK;
+    }
     switch (rl->which)
     {
     case Z_NamePlusRecord_databaseRecord:
@@ -1773,13 +2226,13 @@ static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
 
     if (argc == 0)
     {
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
     {
-	return TCL_OK;
+        return TCL_OK;
     }
-    if (argc < 3)
+    if (argc != 3)
     {
         sprintf (interp->result, "wrong # args");
         return TCL_ERROR;
@@ -1800,6 +2253,36 @@ static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
 }
 
 /*
+ * set record elements (for record extraction)
+ */
+static int do_recordElements (void *o, Tcl_Interp *interp,
+                              int argc, char **argv)
+{
+    IrTcl_SetObj *obj = o;
+
+    if (argc == 0)
+    {
+        obj->recordElements = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (NULL, &obj->recordElements);
+    if (argc > 3)
+    {
+        sprintf (interp->result, "wrong # args");
+        return TCL_ERROR;
+    }
+    if (argc == 3)
+    {
+        free (obj->recordElements);
+        return ir_tcl_strdup (NULL, &obj->recordElements, 
+                              (*argv[2] ? argv[2] : NULL));
+    }
+    Tcl_AppendResult (interp, obj->recordElements, NULL);
+    return TCL_OK;
+}
+
+/*
  * ir_diagResult 
  */
 static int ir_diagResult (Tcl_Interp *interp, IrTcl_Diagnostic *list, int num)
@@ -1837,7 +2320,7 @@ static int do_diag (void *o, Tcl_Interp *interp, int argc, char **argv)
 
     if (argc <= 0)
         return TCL_OK;
-    if (argc < 3)
+    if (argc != 3)
     {
         sprintf (interp->result, "wrong # args");
         return TCL_ERROR;
@@ -1902,7 +2385,7 @@ static int do_getSutrs (void *o, Tcl_Interp *interp, int argc, char **argv)
 
     if (argc <= 0)
         return TCL_OK;
-    if (argc < 3)
+    if (argc != 3)
     {
         sprintf (interp->result, "wrong # args");
         return TCL_ERROR;
@@ -1928,6 +2411,41 @@ static int do_getSutrs (void *o, Tcl_Interp *interp, int argc, char **argv)
 
 
 /*
+ * do_getGrs: Get a GRS1 Record
+ */
+static int do_getGrs (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");
+        return TCL_ERROR;
+    }
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
+        return TCL_ERROR;
+    rl = find_IR_record (obj, offset);
+    if (!rl)
+    {
+        Tcl_AppendResult (interp, "No record at #", argv[2], NULL);
+        return TCL_ERROR;
+    }
+    if (rl->which != Z_NamePlusRecord_databaseRecord)
+    {
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
+        return TCL_ERROR;
+    }
+    if (rl->u.dbrec.type != VAL_GRS1)
+        return TCL_OK;
+    return ir_tcl_get_grs (interp, rl->u.dbrec.u.grs1, argc, argv);
+}
+
+
+/*
  * do_responseStatus: Return response status (present or search)
  */
 static int do_responseStatus (void *o, Tcl_Interp *interp, 
@@ -1940,7 +2458,7 @@ static int do_responseStatus (void *o, Tcl_Interp *interp,
         obj->recordFlag = 0;
         obj->nonSurrogateDiagnosticNum = 0;
         obj->nonSurrogateDiagnosticList = NULL;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
     {
@@ -1956,7 +2474,7 @@ static int do_responseStatus (void *o, Tcl_Interp *interp,
     switch (obj->which)
     {
     case Z_Records_DBOSD:
-    	Tcl_AppendElement (interp, "DBOSD");
+        Tcl_AppendElement (interp, "DBOSD");
         break;
     case Z_Records_NSD:
         Tcl_AppendElement (interp, "NSD");
@@ -2020,7 +2538,7 @@ static int do_present (void *o, Tcl_Interp *interp, int argc, char **argv)
         struct oident ident;
 
         ident.proto = p->protocol_type;
-        ident.class = CLASS_RECSYN;
+        ident.oclass = CLASS_RECSYN;
         ident.value = *obj->set_inher.preferredRecordSyntax;
         logf (LOG_DEBUG, "Preferred record syntax is %d", ident.value);
         req->preferredRecordSyntax = odr_oiddup (p->odr_out, 
@@ -2028,8 +2546,22 @@ static int do_present (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
     else
         req->preferredRecordSyntax = 0;
-     
-    return ir_tcl_send_APDU (interp, p, apdu, "present", argv[0]);
+
+    if (obj->set_inher.elementSetNames && *obj->set_inher.elementSetNames)
+    {
+        Z_ElementSetNames *esn = odr_malloc (p->odr_out, sizeof(*esn));
+        Z_RecordComposition *compo = odr_malloc (p->odr_out, sizeof(*compo));
+
+        esn->which = Z_ElementSetNames_generic;
+        esn->u.generic = obj->set_inher.elementSetNames;
+
+        req->recordComposition = compo;
+        compo->which = Z_RecordComp_simple;
+        compo->u.simple = esn;
+    }
+    else
+        req->recordComposition = NULL;
+    return ir_tcl_send_APDU (interp, p, apdu, "present", *argv);
 }
 
 /*
@@ -2047,7 +2579,7 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
 
     if (argc <= 0)
         return TCL_OK;
-    if (argc < 3)
+    if (argc != 3)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
@@ -2062,10 +2594,10 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
     {
         IrTcl_RecordList *rl;
 
-        rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord);
+        rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord, "F");
         rl->u.dbrec.type = VAL_USMARC;
         rl->u.dbrec.buf = buf;
-	rl->u.dbrec.size = size;
+        rl->u.dbrec.size = size;
         no++;
     }
     setobj->numberOfRecordsReturned = no-1;
@@ -2074,22 +2606,26 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
 }
 
 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, "getSutrs",                do_getSutrs },
-    { 0, "recordType",              do_recordType },
-    { 0, "diag",                    do_diag },
-    { 0, "responseStatus",          do_responseStatus },
-    { 0, "loadFile",                do_loadFile },
-    { 0, NULL, NULL}
+    { "search",                  do_search, NULL},
+    { "searchResponse",          do_searchResponse, NULL},
+    { "presentResponse",         do_presentResponse, NULL},
+    { "searchStatus",            do_searchStatus, NULL},
+    { "presentStatus",           do_presentStatus, NULL},
+    { "nextResultSetPosition",   do_nextResultSetPosition, NULL},
+    { "setName",                 do_setName, NULL},
+    { "resultCount",             do_resultCount, NULL},
+    { "numberOfRecordsReturned", do_numberOfRecordsReturned, NULL},
+    { "present",                 do_present, NULL},
+    { "type",                    do_type, NULL},
+    { "getMarc",                 do_getMarc, NULL},
+    { "getSutrs",                do_getSutrs, NULL},
+    { "getGrs",                  do_getGrs, NULL},
+    { "recordType",              do_recordType, NULL},
+    { "recordElements",          do_recordElements, NULL},
+    { "diag",                    do_diag, NULL},
+    { "responseStatus",          do_responseStatus, NULL},
+    { "loadFile",                do_loadFile, NULL},
+    { NULL, NULL}
 };
 
 /* 
@@ -2100,6 +2636,7 @@ static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
 {
     IrTcl_Methods tabs[3];
     IrTcl_SetObj *p = clientData;
+    int r;
 
     if (argc < 2)
     {
@@ -2112,7 +2649,8 @@ static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
     tabs[1].obj = &p->set_inher;
     tabs[2].tab = NULL;
 
-    return ir_method (interp, argc, argv, tabs);
+    ir_tcl_method (interp, argc, argv, tabs, &r);
+    return r;
 }
 
 /* 
@@ -2131,16 +2669,17 @@ static void ir_set_obj_delete (ClientData clientData)
     tabs[1].obj = &p->set_inher;
     tabs[2].tab = NULL;
 
-    ir_method (NULL, -1, NULL, tabs);
+    ir_tcl_method (NULL, -1, NULL, tabs, NULL);
 
     free (p);
 }
 
 /*
- * ir_set_obj_mk: IR Set Object creation
+ * ir_set_obj_init: IR Set Object initialization
  */
-static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
-                          int argc, char **argv)
+static int ir_set_obj_init (ClientData clientData, Tcl_Interp *interp,
+                            int argc, char **argv, ClientData *subData,
+                            ClientData parentData)
 {
     IrTcl_Methods tabs[3];
     IrTcl_SetObj *obj;
@@ -2152,33 +2691,30 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
     }
     obj = ir_tcl_malloc (sizeof(*obj));
     logf (LOG_DEBUG, "ir set create");
-    if (argc == 3)
+    if (parentData)
     {
-        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;
+        obj->parent = (IrTcl_Obj *) parentData;
 
         dst = &obj->set_inher;
         src = &obj->parent->set_inher;
 
-        dst->num_databaseNames = src->num_databaseNames;
-        dst->databaseNames =
-              ir_tcl_malloc (sizeof (*dst->databaseNames)
-                         * dst->num_databaseNames);
-        for (i = 0; i < dst->num_databaseNames; i++)
+        if ((dst->num_databaseNames = src->num_databaseNames))
         {
-            if (ir_tcl_strdup (interp, &dst->databaseNames[i],
-                           src->databaseNames[i]) == TCL_ERROR)
-                return TCL_ERROR;
+            dst->databaseNames =
+                ir_tcl_malloc (sizeof (*dst->databaseNames)
+                               * (1+dst->num_databaseNames));
+            for (i = 0; i < dst->num_databaseNames; i++)
+                if (ir_tcl_strdup (interp, &dst->databaseNames[i],
+                                   src->databaseNames[i]) == TCL_ERROR)
+                    return TCL_ERROR;
+            dst->databaseNames[i] = NULL;
         }
+        else
+            dst->databaseNames = NULL;
         if (ir_tcl_strdup (interp, &dst->queryType, src->queryType)
             == TCL_ERROR)
             return TCL_ERROR;
@@ -2187,6 +2723,20 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
             == TCL_ERROR)
             return TCL_ERROR;
 
+        if (ir_tcl_strdup (interp, &dst->elementSetNames, src->elementSetNames)
+            == TCL_ERROR)
+            return TCL_ERROR;
+
+        if (ir_tcl_strdup (interp, &dst->smallSetElementSetNames,
+                           src->smallSetElementSetNames)
+            == TCL_ERROR)
+            return TCL_ERROR;
+
+        if (ir_tcl_strdup (interp, &dst->mediumSetElementSetNames,
+                           src->mediumSetElementSetNames)
+            == TCL_ERROR)
+            return TCL_ERROR;
+
         if (src->preferredRecordSyntax && 
             (dst->preferredRecordSyntax 
              = ir_tcl_malloc (sizeof(*dst->preferredRecordSyntax))))
@@ -2205,14 +2755,48 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
     tabs[0].obj = obj;
     tabs[1].tab = NULL;
 
-    if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
+    if (ir_tcl_method (interp, 0, NULL, tabs, NULL) == TCL_ERROR)
         return TCL_ERROR;
 
+    *subData = obj;
+    return TCL_OK;
+}
+
+/*
+ * ir_set_obj_mk: IR Set Object creation
+ */
+static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    ClientData subData;
+    ClientData parentData = 0;
+    int r;
+
+    if (argc == 3)
+    {
+        Tcl_CmdInfo parent_info;
+        if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))
+        {
+            interp->result = "No parent";
+            return TCL_ERROR;
+        }
+        parentData = parent_info.clientData;
+    }
+    r = ir_set_obj_init (clientData, interp, argc, argv, &subData, parentData);
+    if (r == TCL_ERROR)
+        return TCL_ERROR;
     Tcl_CreateCommand (interp, argv[1], ir_set_obj_method,
-                       (ClientData) obj, ir_set_obj_delete);
+                       subData, ir_set_obj_delete);
     return TCL_OK;
 }
 
+IrTcl_Class ir_set_obj_class = {
+    "ir-set",
+    ir_set_obj_init,
+    ir_set_obj_method,
+    ir_set_obj_delete
+};
+
 /* ------------------------------------------------------- */
 
 /*
@@ -2240,16 +2824,16 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
     if (!p->set_inher.num_databaseNames)
     {
         interp->result = "no databaseNames";
-	return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (!p->cs_link)
     {
         interp->result = "scan: not connected";
-	return TCL_ERROR;
+        return TCL_ERROR;
     }
 
     bib1.proto = p->protocol_type;
-    bib1.class = CLASS_ATTSET;
+    bib1.oclass = CLASS_ATTSET;
     bib1.value = VAL_BIB1;
 
     apdu = zget_APDU (p->odr_out, Z_APDU_scanRequest);
@@ -2264,7 +2848,7 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
     if (!(req->termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
     {
         Tcl_AppendResult (interp, "Syntax error in query", NULL);
-	return TCL_ERROR;
+        return TCL_ERROR;
     }
 #else
     rpn = ccl_find_str(p->bibset, argv[2], &r, &pos);
@@ -2287,7 +2871,37 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
     logf (LOG_DEBUG, "preferredPositionInResponse=%d",
           *req->preferredPositionInResponse);
     
-    return ir_tcl_send_APDU (interp, p, apdu, "scan", argv[0]);
+    return ir_tcl_send_APDU (interp, p, apdu, "scan", *argv);
+}
+
+/*
+ * do_scanResponse: add scan response handler
+ */
+static int do_scanResponse (void *o, Tcl_Interp *interp,
+                            int argc, char **argv)
+{
+    IrTcl_ScanObj *obj = o;
+
+    if (argc == 0)
+    {
+        obj->scanResponse = NULL;
+        return TCL_OK;
+    }
+    else if (argc == -1)
+        return ir_tcl_strdel (interp, &obj->scanResponse);
+    if (argc == 3)
+    {
+        free (obj->scanResponse);
+        if (argv[2][0])
+        {
+            if (ir_tcl_strdup (interp, &obj->scanResponse, argv[2])
+                == TCL_ERROR)
+                return TCL_ERROR;
+        }
+        else
+            obj->scanResponse = NULL;
+    }
+    return TCL_OK;
 }
 
 /*
@@ -2302,7 +2916,7 @@ static int do_stepSize (void *obj, Tcl_Interp *interp,
         p->stepSize = 0;
         return TCL_OK;
     }
-    return get_set_int (&p->stepSize, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->stepSize, interp, argc, argv);
 }
 
 /*
@@ -2318,7 +2932,7 @@ static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,
         p->numberOfTermsRequested = 20;
         return TCL_OK;
     }
-    return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
 }
 
 
@@ -2335,7 +2949,8 @@ static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,
         p->preferredPositionInResponse = 1;
         return TCL_OK;
     }
-    return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->preferredPositionInResponse, interp,
+                               argc, argv);
 }
 
 /*
@@ -2348,7 +2963,7 @@ static int do_scanStatus (void *obj, Tcl_Interp *interp,
 
     if (argc <= 0)
         return TCL_OK;
-    return get_set_int (&p->scanStatus, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->scanStatus, interp, argc, argv);
 }
 
 /*
@@ -2361,7 +2976,8 @@ static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,
 
     if (argc <= 0)
         return TCL_OK;
-    return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->numberOfEntriesReturned, interp,
+                               argc, argv);
 }
 
 /*
@@ -2374,7 +2990,7 @@ static int do_positionOfTerm (void *obj, Tcl_Interp *interp,
 
     if (argc <= 0)
         return TCL_OK;
-    return get_set_int (&p->positionOfTerm, interp, argc, argv);
+    return ir_tcl_get_set_int (&p->positionOfTerm, interp, argc, argv);
 }
 
 /*
@@ -2389,25 +3005,25 @@ static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
     if (argc == 0)
     {
         p->entries_flag = 0;
-	p->entries = NULL;
-	p->nonSurrogateDiagnosticNum = 0;
+        p->entries = NULL;
+        p->nonSurrogateDiagnosticNum = 0;
         p->nonSurrogateDiagnosticList = 0;
-	return TCL_OK;
+        return TCL_OK;
     }
     else if (argc == -1)
     {
         p->entries_flag = 0;
-	/* release entries */
+        /* release entries */
         p->entries = NULL;
 
         ir_deleteDiags (&p->nonSurrogateDiagnosticList, 
                         &p->nonSurrogateDiagnosticNum);
-	return TCL_OK;
+        return TCL_OK;
     }
     if (argc != 3)
     {
         interp->result = "wrong # args";
-	return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (Tcl_GetInt (interp, argv[2], &i) == TCL_ERROR)
         return TCL_ERROR;
@@ -2418,32 +3034,33 @@ static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
     {
     case Z_Entry_termInfo:
         Tcl_AppendElement (interp, "T");
-	if (p->entries[i].u.term.buf)
-	    Tcl_AppendElement (interp, p->entries[i].u.term.buf);
-	else
-	    Tcl_AppendElement (interp, "");
-	sprintf (numstr, "%d", p->entries[i].u.term.globalOccurrences);
-	Tcl_AppendElement (interp, numstr);
-	break;
+        if (p->entries[i].u.term.buf)
+            Tcl_AppendElement (interp, p->entries[i].u.term.buf);
+        else
+            Tcl_AppendElement (interp, "");
+        sprintf (numstr, "%d", p->entries[i].u.term.globalOccurrences);
+        Tcl_AppendElement (interp, numstr);
+        break;
     case Z_Entry_surrogateDiagnostic:
         Tcl_AppendElement (interp, "SD");
         return ir_diagResult (interp, p->entries[i].u.diag.list,
                               p->entries[i].u.diag.num);
-	break;
+        break;
     }
     return TCL_OK;
 }
 
 static IrTcl_Method ir_scan_method_tab[] = {
-    { 0, "scan",                    do_scan },
-    { 0, "stepSize",                do_stepSize },
-    { 0, "numberOfTermsRequested",  do_numberOfTermsRequested },
-    { 0, "preferredPositionInResponse", do_preferredPositionInResponse },
-    { 0, "scanStatus",              do_scanStatus },
-    { 0, "numberOfEntriesReturned", do_numberOfEntriesReturned },
-    { 0, "positionOfTerm",          do_positionOfTerm },
-    { 0, "scanLine",                do_scanLine },
-    { 0, NULL, NULL}
+    { "scan",                    do_scan, NULL},
+    { "scanResponse",            do_scanResponse, NULL},
+    { "stepSize",                do_stepSize, NULL},
+    { "numberOfTermsRequested",  do_numberOfTermsRequested, NULL},
+    { "preferredPositionInResponse", do_preferredPositionInResponse, NULL},
+    { "scanStatus",              do_scanStatus, NULL},
+    { "numberOfEntriesReturned", do_numberOfEntriesReturned, NULL},
+    { "positionOfTerm",          do_positionOfTerm, NULL},
+    { "scanLine",                do_scanLine, NULL},
+    { NULL, NULL}
 };
 
 /* 
@@ -2453,6 +3070,7 @@ static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
                                int argc, char **argv)
 {
     IrTcl_Methods tabs[2];
+    int r;
 
     if (argc < 2)
     {
@@ -2463,7 +3081,8 @@ static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
     tabs[0].obj = clientData;
     tabs[1].tab = NULL;
 
-    return ir_method (interp, argc, argv, tabs);
+    ir_tcl_method (interp, argc, argv, tabs, &r);
+    return r;
 }
 
 /* 
@@ -2478,7 +3097,7 @@ static void ir_scan_obj_delete (ClientData clientData)
     tabs[0].obj = obj;
     tabs[1].tab = NULL;
 
-    ir_method (NULL, -1, NULL, tabs);
+    ir_tcl_method (NULL, -1, NULL, tabs, NULL);
     free (obj);
 }
 
@@ -2500,7 +3119,7 @@ static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
     if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))
     {
         interp->result = "No parent";
-	return TCL_ERROR;
+        return TCL_ERROR;
     }
     obj = ir_tcl_malloc (sizeof(*obj));
     obj->parent = (IrTcl_Obj *) parent_info.clientData;
@@ -2509,7 +3128,7 @@ static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
     tabs[0].obj = obj;
     tabs[1].tab = NULL;
 
-    if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
+    if (ir_tcl_method (interp, 0, NULL, tabs, NULL) == TCL_ERROR)
         return TCL_ERROR;
     Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,
                        (ClientData) obj, ir_scan_obj_delete);
@@ -2602,7 +3221,8 @@ static void ir_handleDiags (IrTcl_Diagnostic **dst_list, int *dst_num,
     }
 }
 
-static void ir_handleRecords (void *o, Z_Records *zrs, IrTcl_SetObj *setobj)
+static void ir_handleRecords (void *o, Z_Records *zrs, IrTcl_SetObj *setobj,
+                              const char *elements)
 {
     IrTcl_Obj *p = o;
 
@@ -2623,7 +3243,8 @@ static void ir_handleRecords (void *o, Z_Records *zrs, IrTcl_SetObj *setobj)
         {
             rl = new_IR_record (setobj, setobj->start + offset,
                                 zrs->u.databaseOrSurDiagnostics->
-                                records[offset]->which);
+                                records[offset]->which,
+                                elements);
             if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
             {
                 ir_handleDiags (&rl->u.surrogateDiagnostics.list,
@@ -2641,16 +3262,18 @@ static void ir_handleRecords (void *o, Z_Records *zrs, IrTcl_SetObj *setobj)
                 zr = zrs->u.databaseOrSurDiagnostics->records[offset]
                     ->u.databaseRecord;
                 oe = (Z_External*) zr;
-		rl->u.dbrec.size = zr->u.octet_aligned->len;
+                rl->u.dbrec.size = zr->u.octet_aligned->len;
 
-                rl->u.dbrec.type = VAL_USMARC;
                 if ((ident = oid_getentbyoid (oe->direct_reference)))
                     rl->u.dbrec.type = ident->value;
+                else
+                    rl->u.dbrec.type = VAL_USMARC;
+
                 if (oe->which == ODR_EXTERNAL_octet && rl->u.dbrec.size > 0)
                 {
                     char *buf = (char*) zr->u.octet_aligned->buf;
                     if ((rl->u.dbrec.buf = ir_tcl_malloc (rl->u.dbrec.size)))
-		        memcpy (rl->u.dbrec.buf, buf, rl->u.dbrec.size);
+                        memcpy (rl->u.dbrec.buf, buf, rl->u.dbrec.size);
                 }
                 else if (rl->u.dbrec.type == VAL_SUTRS && 
                          oe->which == Z_External_sutrs)
@@ -2665,6 +3288,12 @@ static void ir_handleRecords (void *o, Z_Records *zrs, IrTcl_SetObj *setobj)
                     }
                     rl->u.dbrec.size = oe->u.sutrs->len;
                 }
+                else if (rl->u.dbrec.type == VAL_GRS1 && 
+                         oe->which == Z_External_grs1)
+                {
+                    ir_tcl_grs_mk (oe->u.grs1, &rl->u.dbrec.u.grs1);
+                    rl->u.dbrec.buf = NULL;
+                }
                 else
                     rl->u.dbrec.buf = NULL;
             }
@@ -2700,7 +3329,7 @@ static void ir_searchResponse (void *o, Z_SearchResponse *searchrs,
     if (!setobj)
     {
         logf (LOG_DEBUG, "Search response, no object!");
-	return;
+        return;
     }
     setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
     get_referenceId (&setobj->set_inher.referenceId, searchrs->referenceId);
@@ -2713,7 +3342,14 @@ static void ir_searchResponse (void *o, Z_SearchResponse *searchrs,
     logf (LOG_DEBUG, "Search response %d, %d hits", 
           setobj->searchStatus, setobj->resultCount);
     if (zrs)
-        ir_handleRecords (o, zrs, setobj);
+    {
+        const char *es;
+        if (setobj->resultCount <= setobj->set_inher.smallSetUpperBound)
+            es = setobj->set_inher.smallSetElementSetNames;
+        else 
+            es = setobj->set_inher.mediumSetElementSetNames;
+        ir_handleRecords (o, zrs, setobj, es);
+    }
     else
         setobj->recordFlag = 0;
 }
@@ -2728,13 +3364,13 @@ static void ir_presentResponse (void *o, Z_PresentResponse *presrs,
     if (!setobj)
     {
         logf (LOG_DEBUG, "Present response, no object!");
-	return;
+        return;
     }
     setobj->presentStatus = *presrs->presentStatus;
     get_referenceId (&setobj->set_inher.referenceId, presrs->referenceId);
     setobj->nextResultSetPosition = *presrs->nextResultSetPosition;
     if (zrs)
-        ir_handleRecords (o, zrs, setobj);
+        ir_handleRecords (o, zrs, setobj, setobj->set_inher.elementSetNames);
     else
     {
         setobj->recordFlag = 0;
@@ -2775,50 +3411,50 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs,
     if (scanrs->entries)
     {
         int i;
-	Z_Entry *ze;
+        Z_Entry *ze;
 
         scanobj->entries_flag = 1;
         scanobj->which = scanrs->entries->which;
-	switch (scanobj->which)
-	{
-	case Z_ListEntries_entries:
-	    scanobj->num_entries = scanrs->entries->u.entries->num_entries;
-	    scanobj->entries = ir_tcl_malloc (scanobj->num_entries * 
-	                               sizeof(*scanobj->entries));
+        switch (scanobj->which)
+        {
+        case Z_ListEntries_entries:
+            scanobj->num_entries = scanrs->entries->u.entries->num_entries;
+            scanobj->entries = ir_tcl_malloc (scanobj->num_entries * 
+                                       sizeof(*scanobj->entries));
             for (i=0; i<scanobj->num_entries; i++)
-	    {
-	        ze = scanrs->entries->u.entries->entries[i];
+            {
+                ze = scanrs->entries->u.entries->entries[i];
                 scanobj->entries[i].which = ze->which;
-		switch (ze->which)
-		{
-		case Z_Entry_termInfo:
-		    if (ze->u.termInfo->term->which == Z_Term_general)
-		    {
+                switch (ze->which)
+                {
+                case Z_Entry_termInfo:
+                    if (ze->u.termInfo->term->which == Z_Term_general)
+                    {
                         int l = ze->u.termInfo->term->u.general->len;
                         scanobj->entries[i].u.term.buf = ir_tcl_malloc (1+l);
-			memcpy (scanobj->entries[i].u.term.buf, 
-			        ze->u.termInfo->term->u.general->buf,
+                        memcpy (scanobj->entries[i].u.term.buf, 
+                                ze->u.termInfo->term->u.general->buf,
                                 l);
                         scanobj->entries[i].u.term.buf[l] = '\0';
-		    }
-		    else
+                    }
+                    else
                         scanobj->entries[i].u.term.buf = NULL;
-		    if (ze->u.termInfo->globalOccurrences)
-		        scanobj->entries[i].u.term.globalOccurrences = 
-		            *ze->u.termInfo->globalOccurrences;
-		    else
-		        scanobj->entries[i].u.term.globalOccurrences = 0;
+                    if (ze->u.termInfo->globalOccurrences)
+                        scanobj->entries[i].u.term.globalOccurrences = 
+                            *ze->u.termInfo->globalOccurrences;
+                    else
+                        scanobj->entries[i].u.term.globalOccurrences = 0;
                     break;
-		case Z_Entry_surrogateDiagnostic:
+                case Z_Entry_surrogateDiagnostic:
                     ir_handleDiags (&scanobj->entries[i].u.diag.list,
                                     &scanobj->entries[i].u.diag.num,
                                     &ze->u.surrogateDiagnostic,
                                     1);
-		    break;
-		}
-	    }
+                    break;
+                }
+            }
             break;
-	case Z_ListEntries_nonSurrogateDiagnostics:
+        case Z_ListEntries_nonSurrogateDiagnostics:
             ir_handleDiags (&scanobj->nonSurrogateDiagnosticList,
                             &scanobj->nonSurrogateDiagnosticNum,
                             scanrs->entries->u.nonSurrogateDiagnostics->
@@ -2826,7 +3462,7 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs,
                             scanrs->entries->u.nonSurrogateDiagnostics->
                             num_diagRecs);
             break;
-	}
+        }
     }
     else
         scanobj->entries_flag = 0;
@@ -2835,7 +3471,7 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs,
 /*
  * ir_select_read: handle incoming packages
  */
-void ir_select_read (ClientData clientData)
+static void ir_select_read (ClientData clientData)
 {
     IrTcl_Obj *p = clientData;
     Z_APDU *apdu;
@@ -2843,9 +3479,12 @@ void ir_select_read (ClientData clientData)
     IrTcl_Request *rq;
     char *object_name;
     Tcl_CmdInfo cmd_info;
+    const char *apdu_call;
 
+    logf(LOG_DEBUG, "Read handler fd=%d", cs_fileno(p->cs_link));
     if (p->state == IR_TCL_R_Connecting)
     {
+	logf(LOG_DEBUG, "Connect handler");
         r = cs_rcvconnect (p->cs_link);
         if (r == 1)
         {
@@ -2853,67 +3492,84 @@ void ir_select_read (ClientData clientData)
             return;
         }
         p->state = IR_TCL_R_Idle;
+        p->ref_count = 2;
+#if IRTCL_GENERIC_FILES
+        ir_select_remove_write (p->csFile, p);
+#else
         ir_select_remove_write (cs_fileno (p->cs_link), p);
+#endif
         if (r < 0)
         {
             logf (LOG_DEBUG, "cs_rcvconnect error");
+            ir_tcl_disconnect (p);
             if (p->failback)
             {
                 p->failInfo = IR_TCL_FAIL_CONNECT;
-                IrTcl_eval (p->interp, p->failback);
+                ir_tcl_eval (p->interp, p->failback);
             }
-            do_disconnect (p, NULL, 2, NULL);
+            ir_obj_delete (p);
             return;
         }
-        p->state = IR_TCL_R_Idle;
         if (p->callback)
-	    IrTcl_eval (p->interp, p->callback);
-        if (p->cs_link && p->request_queue && p->state == IR_TCL_R_Idle)
+            ir_tcl_eval (p->interp, p->callback);
+        if (p->ref_count == 2 && p->cs_link && p->request_queue
+            && p->state == IR_TCL_R_Idle)
             ir_tcl_send_q (p, p->request_queue, "x");
+        ir_obj_delete (p);
         return;
     }
     do
     {
-	/* signal one more use of ir object - callbacks must not
-	   release the ir memory (p pointer) */
         p->state = IR_TCL_R_Reading;
-	++(p->ref_count);
 
         /* read incoming APDU */
-        if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) <= 0)
+        if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) == 1)
+	{
+	    logf(LOG_DEBUG, "PDU Fraction read");
+            return ;
+	}
+        /* signal one more use of ir object - callbacks must not
+           release the ir memory (p pointer) */
+        p->ref_count = 2;
+        if (r <= 0)
         {
             logf (LOG_DEBUG, "cs_get failed, code %d", r);
+#if IRTCL_GENERIC_FILES
+            ir_select_remove (p->csFile, p);
+#else
             ir_select_remove (cs_fileno (p->cs_link), p);
+#endif
+            ir_tcl_disconnect (p);
             if (p->failback)
             {
                 p->failInfo = IR_TCL_FAIL_READ;
-                IrTcl_eval (p->interp, p->failback);
+                ir_tcl_eval (p->interp, p->failback);
             }
-            do_disconnect (p, NULL, 2, NULL);
-
-	    /* release ir object now if callback deleted it */
-	    ir_obj_delete (p);
+            /* release ir object now if callback deleted it */
+            ir_obj_delete (p);
             return;
         }        
-        if (r == 1)
-            return ;
         /* got complete APDU. Now decode */
+        p->apduLen = r;
+        p->apduOffset = -1;
         odr_setbuf (p->odr_in, p->buf_in, r, 0);
-        logf (LOG_DEBUG, "cs_get ok, got %d", r);
+        logf (LOG_DEBUG, "cs_get ok, total size %d", r);
         if (!z_APDU (p->odr_in, &apdu, 0))
         {
-            logf (LOG_DEBUG, "%s", odr_errlist [odr_geterror (p->odr_in)]);
+            logf (LOG_DEBUG, "cs_get failed: %s",
+		odr_errmsg (odr_geterror (p->odr_in)));
+            ir_tcl_disconnect (p);
             if (p->failback)
             {
                 p->failInfo = IR_TCL_FAIL_IN_APDU;
-                IrTcl_eval (p->interp, p->failback);
+                p->apduOffset = odr_offset (p->odr_in);
+                ir_tcl_eval (p->interp, p->failback);
             }
-            do_disconnect (p, NULL, 2, NULL);
-
-	    /* release ir object now if failback deleted it */
-	    ir_obj_delete (p);
+            /* release ir object now if failback deleted it */
+            ir_obj_delete (p);
             return;
         }
+	logf(LOG_DEBUG, "Decoded ok");
         /* handle APDU and invoke callback */
         rq = p->request_queue;
         if (!rq)
@@ -2922,53 +3578,68 @@ void ir_select_read (ClientData clientData)
             exit (1);
         }
         object_name = rq->object_name;
+        logf (LOG_DEBUG, "getCommandInfo (%s)", object_name);
+        apdu_call = NULL;
         if (Tcl_GetCommandInfo (p->interp, object_name, &cmd_info))
         {
             switch(apdu->which)
             {
             case Z_APDU_initResponse:
+                p->eventType = "init";
                 ir_initResponse (p, apdu->u.initResponse);
+		apdu_call = p->initResponse;
                 break;
             case Z_APDU_searchResponse:
+                p->eventType = "search";
                 ir_searchResponse (p, apdu->u.searchResponse,
                                    (IrTcl_SetObj *) cmd_info.clientData);
+                apdu_call = ((IrTcl_SetObj *) 
+                             cmd_info.clientData)->searchResponse;
                 break;
             case Z_APDU_presentResponse:
+                p->eventType = "present";
                 ir_presentResponse (p, apdu->u.presentResponse,
                                     (IrTcl_SetObj *) cmd_info.clientData);
+                apdu_call = ((IrTcl_SetObj *) 
+                             cmd_info.clientData)->presentResponse;
                 break;
             case Z_APDU_scanResponse:
+                p->eventType = "scan";
                 ir_scanResponse (p, apdu->u.scanResponse, 
                                  (IrTcl_ScanObj *) cmd_info.clientData);
+                apdu_call = ((IrTcl_ScanObj *) 
+                             cmd_info.clientData)->scanResponse;
                 break;
             default:
                 logf (LOG_WARN, "Received unknown APDU type (%d)",
                       apdu->which);
+                ir_tcl_disconnect (p);
                 if (p->failback)
                 {
                     p->failInfo = IR_TCL_FAIL_UNKNOWN_APDU;
-                    IrTcl_eval (p->interp, p->failback);
+                    ir_tcl_eval (p->interp, p->failback);
                 }
-                do_disconnect (p, NULL, 2, NULL);
                 return;
             }
         }
         p->request_queue = rq->next;
         p->state = IR_TCL_R_Idle;
-        
-        if (rq->callback)
-            IrTcl_eval (p->interp, rq->callback);
+       
+        if (apdu_call)
+            ir_tcl_eval (p->interp, apdu_call);
+        else if (rq->callback)
+            ir_tcl_eval (p->interp, rq->callback);
         free (rq->buf_out);
         free (rq->callback);
         free (rq->object_name);
         free (rq);
         odr_reset (p->odr_in);
-	if (p->ref_count == 1)
-	{
-	    ir_obj_delete (p);
-	    return;
-	}
-	--(p->ref_count);
+        if (p->ref_count == 1)
+        {
+            ir_obj_delete (p);
+            return;
+        }
+        ir_obj_delete (p);
     } while (p->cs_link && cs_more (p->cs_link));
     if (p->cs_link && p->request_queue && p->state == IR_TCL_R_Idle)
         ir_tcl_send_q (p, p->request_queue, "x");
@@ -2977,74 +3648,99 @@ void ir_select_read (ClientData clientData)
 /*
  * ir_select_write: handle outgoing packages - not yet written.
  */
-void ir_select_write (ClientData clientData)
+static void ir_select_write (ClientData clientData)
 {
     IrTcl_Obj *p = clientData;
     int r;
     IrTcl_Request *rq;
 
-    logf (LOG_DEBUG, "In write handler");
+    logf (LOG_DEBUG, "Write handler fd=%d", cs_fileno(p->cs_link));
     if (p->state == IR_TCL_R_Connecting)
     {
+	logf(LOG_DEBUG, "Connect handler");
         r = cs_rcvconnect (p->cs_link);
         if (r == 1)
+        {
+            logf (LOG_DEBUG, "cs_rcvconnect returned 1");
             return;
+        }
         p->state = IR_TCL_R_Idle;
+        p->ref_count = 2;
+#if IRTCL_GENERIC_FILES
+        ir_select_remove_write (p->csFile, p);
+#else
+        ir_select_remove_write (cs_fileno (p->cs_link), p);
+#endif
         if (r < 0)
         {
             logf (LOG_DEBUG, "cs_rcvconnect error");
-            ir_select_remove_write (cs_fileno (p->cs_link), p);
+            ir_tcl_disconnect (p);
             if (p->failback)
             {
                 p->failInfo = IR_TCL_FAIL_CONNECT;
-                IrTcl_eval (p->interp, p->failback);
+                ir_tcl_eval (p->interp, p->failback);
             }
-            do_disconnect (p, NULL, 2, NULL);
+            ir_obj_delete (p);
             return;
         }
-        ir_select_remove_write (cs_fileno (p->cs_link), p);
         if (p->callback)
-	    IrTcl_eval (p->interp, p->callback);
+            ir_tcl_eval (p->interp, p->callback);
+        ir_obj_delete (p);
         return;
     }
     rq = p->request_queue;
+    if (!rq || !rq->buf_out)
+        return;
     assert (rq);
     if ((r=cs_put (p->cs_link, rq->buf_out, rq->len_out)) < 0)
     {
-        logf (LOG_DEBUG, "select write fail");
+        logf (LOG_DEBUG, "cs_put write fail");
+        p->ref_count = 2;
+        free (rq->buf_out);
+        rq->buf_out = NULL;
+        ir_tcl_disconnect (p);
         if (p->failback)
         {
             p->failInfo = IR_TCL_FAIL_WRITE;
-            IrTcl_eval (p->interp, p->failback);
+            ir_tcl_eval (p->interp, p->failback);
         }
-        free (rq->buf_out);
-        rq->buf_out = NULL;
-        do_disconnect (p, NULL, 2, NULL);
+        ir_obj_delete (p);
     }
     else if (r == 0)            /* remove select bit */
     {
+	logf (LOG_DEBUG, "Write completed");
         p->state = IR_TCL_R_Waiting;
+#if IRTCL_GENERIC_FILES
+        ir_select_remove_write (p->csFile, p);
+#else
         ir_select_remove_write (cs_fileno (p->cs_link), p);
+#endif
         free (rq->buf_out);
         rq->buf_out = NULL;
     }
 }
 
+static void ir_select_notify (ClientData clientData, int r, int w, int e)
+{
+    if (r)
+        ir_select_read (clientData);
+    if (w)
+        ir_select_write (clientData);
+}
+
 /* ------------------------------------------------------- */
 
 /*
- * ir_tcl_init: Registration of TCL commands.
+ * Irtcl_init: Registration of TCL commands.
  */
-int ir_tcl_init (Tcl_Interp *interp)
+int Irtcl_Init (Tcl_Interp *interp)
 {
     Tcl_CreateCommand (interp, "ir", ir_obj_mk, (ClientData) NULL,
                        (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand (interp, "ir-set", ir_set_obj_mk,
-    		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+                       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand (interp, "ir-scan", ir_scan_obj_mk,
-    		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
-    irTcl_interp = interp;
+                       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
 
-