X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ir-tcl.c;h=2f2c351da4aa4db7999f0c5587a5836fa0bcf3ea;hb=df5d5526e333bd83a4f656840e7bb57df4bd7f9d;hp=4136cfa1d387edb2f34429505f76ad2ed1ba087e;hpb=7dd77a1b99f5d7202ec35d7a9d31266799290eb2;p=ir-tcl-moved-to-github.git

diff --git a/ir-tcl.c b/ir-tcl.c
index 4136cfa..2f2c351 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.21  1995-03-31 08:56:37  adam
+ * 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
+ * Further development of scan.
+ *
+ * Revision 1.24  1995/04/11  14:16:42  adam
+ * Further work on scan. Response works. Entries aren't saved yet.
+ *
+ * Revision 1.23  1995/04/10  10:50:27  adam
+ * Result-set name defaults to suffix of ir-set name.
+ * Started working on scan. Not finished at this point.
+ *
+ * Revision 1.22  1995/03/31  10:43:03  adam
+ * More robust when getting bad MARC records.
+ *
+ * Revision 1.21  1995/03/31  08:56:37  adam
  * New button "Search".
  *
  * Revision 1.20  1995/03/29  16:07:09  adam
@@ -72,101 +96,9 @@
 #include <sys/time.h>
 #include <assert.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 <diagbib1.h>
-
-#include <tcl.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;
-
-    struct IRSetObj_ *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;
+#include "ir-tclp.h"
 
 typedef struct {
     int type;
@@ -174,6 +106,7 @@ typedef struct {
     int (*method) (void *obj, Tcl_Interp *interp, int argc, char **argv);
 } IRMethod;
 
+
 static int do_disconnect (void *obj,Tcl_Interp *interp, int argc, char **argv);
 
 static IRRecordList *new_IR_record (IRSetObj *setobj, int no, int which)
@@ -220,10 +153,53 @@ static IRRecordList *find_IR_record (IRSetObj *setobj, int no)
 }
 
 /*
+ * getsetint: Set/get integer value
+ */
+static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
+{
+    char buf[20];
+    
+    if (argc == 3)
+    {
+        if (Tcl_GetInt (interp, argv[2], val)==TCL_ERROR)
+            return TCL_ERROR;
+    }
+    sprintf (buf, "%d", *val);
+    Tcl_AppendResult (interp, buf, NULL);
+    return TCL_OK;
+}
+
+/*
+ * 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.
  */
 static int get_parent_info (Tcl_Interp *interp, const char *name,
-			    Tcl_CmdInfo *parent_info)
+			    Tcl_CmdInfo *parent_info,
+			    const char **suffix)
 {
     char parent_name[128];
     const char *csep = strrchr (name, '.');
@@ -234,6 +210,8 @@ static int get_parent_info (Tcl_Interp *interp, const char *name,
         interp->result = "missing .";
         return TCL_ERROR;
     }
+    if (suffix)
+        *suffix = csep+1;
     pos = csep-name;
     if (pos > 127)
         pos = 127;
@@ -251,12 +229,14 @@ static int get_parent_info (Tcl_Interp *interp, const char *name,
  * 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 *tab, int sigerr)
 {
     IRMethod *t;
     for (t = tab; t->name; t++)
         if (!strcmp (t->name, argv[1]))
             return (*t->method)(obj, interp, argc, argv);
+    if (sigerr)
+        return TCL_ERROR;
     Tcl_AppendResult (interp, "Bad method. Possible values:", NULL);
     for (t = tab; t->name; t++)
         Tcl_AppendResult (interp, " ", t->name, NULL);
@@ -306,7 +286,7 @@ int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
 /*
  * ir_strdup: Duplicate string
  */
-int ir_strdup (Tcl_Interp *interp, char** p, char *s)
+int ir_strdup (Tcl_Interp *interp, char** p, const char *s)
 {
     *p = malloc (strlen(s)+1);
     if (!*p)
@@ -343,7 +323,7 @@ void *ir_malloc (Tcl_Interp *interp, size_t size)
 static int do_init_request (void *obj, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
-    Z_APDU apdu, *apdup;
+    Z_APDU apdu, *apdup = &apdu;
     IRObj *p = obj;
     Z_InitRequest req;
     int r;
@@ -367,7 +347,6 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
 
     apdu.u.initRequest = &req;
     apdu.which = Z_APDU_initRequest;
-    apdup = &apdu;
 
     if (!z_APDU (p->odr_out, &apdup, 0))
     {
@@ -376,7 +355,7 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
         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";
@@ -421,16 +400,8 @@ static int do_options (void *obj, Tcl_Interp *interp,
 static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
-    char buf[20];
-    if (argc == 3)
-    {
-        if (Tcl_GetInt (interp, argv[2], 
-                        &((IRObj *)obj)->preferredMessageSize)==TCL_ERROR)
-            return TCL_ERROR;
-    }
-    sprintf (buf, "%d", ((IRObj *)obj)->preferredMessageSize);
-    Tcl_AppendResult (interp, buf, NULL);
-    return TCL_OK;
+    IRObj *p = obj;
+    return get_set_int (&p->preferredMessageSize, interp, argc, argv);
 }
 
 /*
@@ -439,16 +410,19 @@ static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
 static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
-    char buf[20];
-    if (argc == 3)
-    {
-        if (Tcl_GetInt (interp, argv[2], 
-                        &((IRObj *)obj)->maximumRecordSize)==TCL_ERROR)
-            return TCL_ERROR;
-    }
-    sprintf (buf, "%d", ((IRObj *)obj)->maximumRecordSize);
-    Tcl_AppendResult (interp, buf, NULL);
-    return TCL_OK;
+    IRObj *p = obj;
+    return get_set_int (&p->maximumRecordSize, interp, argc, argv);
+}
+
+/*
+ * do_initResult: Get init result
+ */
+static int do_initResult (void *o, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    IRObj *obj = o;
+    
+    return get_set_int (&obj->initResult, interp, argc, argv);
 }
 
 
@@ -458,14 +432,16 @@ static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
 static int do_implementationName (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
+    IRObj *p = obj;
+
     if (argc == 3)
     {
         free (((IRObj*)obj)->implementationName);
-        if (ir_strdup (interp, &((IRObj*) obj)->implementationName, argv[2])
+        if (ir_strdup (interp, &p->implementationName, argv[2])
             == TCL_ERROR)
             return TCL_ERROR;
     }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->implementationName,
+    Tcl_AppendResult (interp, p->implementationName,
                       (char*) NULL);
     return TCL_OK;
 }
@@ -489,6 +465,41 @@ static int do_implementationId (void *obj, Tcl_Interp *interp,
 }
 
 /*
+ * do_targetImplementationName: Get Implementation Name of target.
+ */
+static int do_targetImplementationName (void *obj, Tcl_Interp *interp,
+                                    int argc, char **argv)
+{
+    IRObj *p = obj;
+
+    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)
+{
+    Tcl_AppendResult (interp, ((IRObj*)obj)->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)
+{
+    Tcl_AppendResult (interp, ((IRObj*)obj)->targetImplementationVersion,
+                      (char*) NULL);
+    return TCL_OK;
+}
+
+/*
  * do_idAuthentication: Set/get id Authentication
  */
 static int do_idAuthentication (void *obj, Tcl_Interp *interp,
@@ -690,7 +701,7 @@ static int do_databaseNames (void *obj, Tcl_Interp *interp,
                           int argc, char **argv)
 {
     int i;
-    IRObj *p = obj;
+    IRSetCObj *p = obj;
 
     if (argc < 3)
     {
@@ -718,71 +729,127 @@ 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_replaceIndicator (void *obj, Tcl_Interp *interp,
+                                int argc, char **argv)
+{
+    IRSetCObj *p = obj;
+
+    return get_set_int (&p->replaceIndicator, interp, argc, argv);
+}
+
+/*
+ * do_queryType: Set/Get query method
  */
-static int do_query (void *obj, Tcl_Interp *interp,
+static int do_queryType (void *obj, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
-    IRObj *p = obj;
+    IRSetCObj *p = obj;
+
     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;
-    char buf[20];
 
-    if (argc == 3)
-    {
-        if (Tcl_GetInt (interp, argv[2], 
-                        &p->replaceIndicator)==TCL_ERROR)
-            return TCL_ERROR;
-    }
-    sprintf (buf, "%d", p->replaceIndicator);
-    Tcl_AppendResult (interp, buf, NULL);
+    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)
+{
+    IRSetCObj *obj = o;
+
+    return get_set_int (&obj->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)
+{
+    IRSetCObj *obj = o;
+
+    return get_set_int (&obj->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)
+{
+    IRSetCObj *obj = o;
+    
+    return get_set_int (&obj->mediumSetPresentNumber, interp, argc, argv);
+}
+
+
+static IRMethod 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 },
+{ 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 IRMethod ir_set_c_method_tab[] = {
+{ 0, "databaseNames",           do_databaseNames},
+{ 0, "replaceIndicator",        do_replaceIndicator},
+{ 0, "queryType",               do_queryType },
+{ 0, "smallSetUpperBound",      do_smallSetUpperBound},
+{ 0, "largeSetLowerBound",      do_largeSetLowerBound},
+{ 0, "mediumSetPresentNumber",  do_mediumSetPresentNumber},
+{ 0, NULL, NULL}
+};
+
 /* 
  * ir_obj_method: IR Object methods
  */
 static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
-                          int argc, char **argv)
+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}
-    };
     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);
+    if (ir_method (clientData, interp, argc, argv,
+                   ir_method_tab, 1) == TCL_OK)
+        return TCL_OK;
+    return ir_method (&((IRObj*) clientData)->set_inher, interp,
+                      argc, argv, ir_set_c_method_tab, 0);
 }
 
 /* 
@@ -793,6 +860,29 @@ static void ir_obj_delete (ClientData clientData)
     free ( (void*) clientData);
 }
 
+static int ir_reset_inher (Tcl_Interp *interp, IRSetCObj *o)
+{
+    o->smallSetUpperBound = 0;
+    o->largeSetLowerBound = 2;
+    o->mediumSetPresentNumber = 0;
+    o->replaceIndicator = 1;
+#if 0
+    obj->databaseNames = NULL;
+    obj->num_databaseNames = 0; 
+#else
+    o->num_databaseNames = 1;
+    if (!(o->databaseNames =
+          ir_malloc (interp, sizeof(*o->databaseNames))))
+        return TCL_ERROR;
+    if (ir_strdup (interp, &o->databaseNames[0], "Default")
+        == TCL_ERROR)
+        return TCL_ERROR;
+#endif
+    if (ir_strdup (interp, &o->queryType, "rpn") == TCL_ERROR)
+        return TCL_ERROR;
+    return TCL_OK;
+}
+
 /* 
  * ir_obj_mk: IR Object creation
  */
@@ -814,6 +904,9 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     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;
@@ -828,18 +921,14 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     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;
-    obj->databaseNames = NULL;
-    obj->num_databaseNames = 0; 
 
+    obj->targetImplementationName = NULL;
+    obj->targetImplementationId = NULL;
+    obj->targetImplementationVersion = NULL;
+    obj->userInformationField = NULL;
+    
     obj->hostname = NULL;
 
-    if (ir_strdup (interp, &obj->query_method, "rpn") == TCL_ERROR)
-        return TCL_ERROR;
     obj->bibset = ccl_qual_mk (); 
     if ((inf = fopen ("default.bib", "r")))
     {
@@ -860,13 +949,16 @@ 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;
+
+    if (ir_reset_inher (interp, &obj->set_inher) == TCL_ERROR)
+        return TCL_ERROR;
     Tcl_CreateCommand (interp, argv[1], ir_obj_method,
                        (ClientData) obj, ir_obj_delete);
     return TCL_OK;
@@ -881,20 +973,19 @@ static int do_search (void *o, Tcl_Interp *interp,
 {
     Z_SearchRequest req;
     Z_Query query;
-    Z_APDU apdu, *apdup;
-    static Odr_oid bib1[] = {1, 2, 840, 10003, 3, 1, -1};
+    Z_APDU apdu, *apdup = &apdu;
     Odr_oct ccl_query;
     IRSetObj *obj = o;
     IRObj *p = obj->parent;
     int r;
 
-    p->child = o;
+    p->set_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;
@@ -906,27 +997,26 @@ static int do_search (void *o, Tcl_Interp *interp,
     }
     apdu.which = Z_APDU_searchRequest;
     apdu.u.searchRequest = &req;
-    apdup = &apdu;
 
     req.referenceId = 0;
-    req.smallSetUpperBound = &p->smallSetUpperBound;
-    req.largeSetLowerBound = &p->largeSetLowerBound;
-    req.mediumSetPresentNumber = &p->mediumSetPresentNumber;
-    req.replaceIndicator = &p->replaceIndicator;
+    req.smallSetUpperBound = &p->set_inher.smallSetUpperBound;
+    req.largeSetLowerBound = &p->set_inher.largeSetLowerBound;
+    req.mediumSetPresentNumber = &p->set_inher.mediumSetPresentNumber;
+    req.replaceIndicator = &p->set_inher.replaceIndicator;
     req.resultSetName = obj->setName ? obj->setName : "Default";
-    req.num_databaseNames = p->num_databaseNames;
-    req.databaseNames = p->databaseNames;
+    req.num_databaseNames = p->set_inher.num_databaseNames;
+    req.databaseNames = p->set_inher.databaseNames;
     printf ("Search:");
-    for (r=0; r<p->num_databaseNames; r++)
+    for (r=0; r < p->set_inher.num_databaseNames; r++)
     {
-        printf (" %s", p->databaseNames[r]);
+        printf (" %s", p->set_inher.databaseNames[r]);
     }
     req.smallSetElementSetNames = 0;
     req.mediumSetElementSetNames = 0;
     req.preferredRecordSyntax = 0;
     req.query = &query;
 
-    if (!strcmp (p->query_method, "rpn"))
+    if (!strcmp (p->set_inher.queryType, "rpn"))
     {
         int error;
         int pos;
@@ -939,13 +1029,15 @@ static int do_search (void *o, Tcl_Interp *interp,
             Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg(error),NULL);
             return TCL_ERROR;
         }
+        ccl_pr_tree (rpn, stderr);
+        fprintf (stderr, "\n");
         query.which = Z_Query_type_1;
         assert((RPNquery = ccl_rpn_query(rpn)));
-        RPNquery->attributeSetId = bib1;
+        RPNquery->attributeSetId = oid_getoidbyent (&p->bib1);
         query.u.type_1 = RPNquery;
         printf ("- RPN\n");
     }
-    else if (!strcmp (p->query_method, "ccl"))
+    else if (!strcmp (p->set_inher.queryType, "ccl"))
     {
         query.which = Z_Query_type_2;
         query.u.type_2 = &ccl_query;
@@ -964,10 +1056,10 @@ static int do_search (void *o, Tcl_Interp *interp,
         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";
+        interp->result = "cs_put failed in search";
         return TCL_ERROR;
     }
     else if (r == 1)
@@ -990,8 +1082,7 @@ static int do_resultCount (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
 
-    sprintf (interp->result, "%d", obj->resultCount);
-    return TCL_OK;
+    return get_set_int (&obj->resultCount, interp, argc, argv);
 }
 
 /*
@@ -1002,8 +1093,7 @@ static int do_searchStatus (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
 
-    sprintf (interp->result, "%d", obj->searchStatus);
-    return TCL_OK;
+    return get_set_int (&obj->searchStatus, interp, argc, argv);
 }
 
 /*
@@ -1033,8 +1123,7 @@ static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
 
-    sprintf (interp->result, "%d", obj->numberOfRecordsReturned);
-    return TCL_OK;
+    return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
 }
 
 static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
@@ -1043,6 +1132,8 @@ static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
     Iso2709Anchor a;
     char *data;
 
+    if (!rec)
+        return TCL_OK;
     a = iso2709_a_mk (rec);
     while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
     {
@@ -1066,6 +1157,8 @@ static int get_marc_lines(Tcl_Interp *interp, Iso2709Rec rec,
     char *data;
     char *ptag = "";
     
+    if (!rec)
+        return TCL_OK;
     a = iso2709_a_mk (rec);
     while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
     {
@@ -1200,6 +1293,7 @@ static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
 }
 
+
 /*
  * do_responseStatus: Return response status (present or search)
  */
@@ -1207,30 +1301,20 @@ static int do_responseStatus (void *o, Tcl_Interp *interp,
                              int argc, char **argv)
 {
     IRSetObj *obj = o;
-    const char *cp;
-    char buf[28];
 
     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:
-        Tcl_AppendElement (interp, "NSD");
-        sprintf (buf, "%d", obj->condition);
-        Tcl_AppendElement (interp, buf);
-        cp = diagbib1_str (obj->condition);
-        if (cp)
-            Tcl_AppendElement (interp, (char*) cp);
-        else
-            Tcl_AppendElement (interp, "");
-        if (obj->addinfo)
-            Tcl_AppendElement (interp, obj->addinfo);
-        else
-            Tcl_AppendElement (interp, "");
-        break;
+        return mk_nonSurrogateDiagnostics (interp, obj->condition, 
+	                                   obj->addinfo);
     }
     return TCL_OK;
 }
@@ -1244,7 +1328,7 @@ static int do_present (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
     IRObj *p = obj->parent;
-    Z_APDU apdu, *apdup;
+    Z_APDU apdu, *apdup = &apdu;
     Z_PresentRequest req;
     int start;
     int number;
@@ -1272,7 +1356,6 @@ static int do_present (void *o, Tcl_Interp *interp,
     obj->start = start;
     obj->number = number;
 
-    apdup = &apdu;
     apdu.which = Z_APDU_presentRequest;
     apdu.u.presentRequest = &req;
     req.referenceId = 0;
@@ -1291,10 +1374,10 @@ static int do_present (void *o, Tcl_Interp *interp,
         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";
+        interp->result = "cs_put failed in present";
         return TCL_ERROR;
     }
     else if (r == 1)
@@ -1351,7 +1434,6 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
     return TCL_OK;
 }
 
-
 /* 
  * ir_set_obj_method: IR Set Object methods
  */
@@ -1378,7 +1460,10 @@ static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    return ir_method (clientData, interp, argc, argv, tab);
+    if (ir_method (clientData, interp, argc, argv, tab, 1) == TCL_OK)
+        return TCL_OK;
+    return ir_method (&((IRSetObj *)clientData)->set_inher, interp, argc,
+                      argv, ir_set_c_method_tab, 0);
 }
 
 /* 
@@ -1389,28 +1474,66 @@ static void ir_set_obj_delete (ClientData clientData)
     free ( (void*) clientData);
 }
 
-/* 
+/*
  * ir_set_obj_mk: IR Set Object creation
  */
 static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
 			     int argc, char **argv)
 {
-    Tcl_CmdInfo parent_info;
     IRSetObj *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) == TCL_ERROR)
-        return TCL_ERROR;
-    if (!(obj = ir_malloc (interp, sizeof(*obj))))
+    else if (argc == 3)
+    {
+        Tcl_CmdInfo parent_info;
+        int i;
+        IRSetCObj *dst;
+        IRSetCObj *src;
+
+        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->parent = (IRObj *) 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++)
+        {
+            printf ("database %i %s\n", i, src->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;
+        
+        dst->smallSetUpperBound = src->smallSetUpperBound;
+        dst->largeSetLowerBound = src->largeSetLowerBound;
+        dst->mediumSetPresentNumber = src->mediumSetPresentNumber;
+        printf ("ssu lsl msp %d %d %d\n", dst->smallSetUpperBound,
+                dst->largeSetLowerBound, dst->mediumSetPresentNumber);
+    }   
+    else
+        obj->parent = NULL;
+    if (ir_strdup (interp, &obj->setName, argv[2]) == TCL_ERROR)
         return TCL_ERROR;
-    obj->setName = NULL;
     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;
@@ -1418,36 +1541,319 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
 
 /* ------------------------------------------------------- */
 
+/*
+ * do_scan: Perform scan 
+ */
+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;
+    int r, pos;
+    struct ccl_rpn_node *rpn;
+
+    p->scan_child = o;
+    if (argc != 3)
+    {
+        interp->result = "wrong # args";
+        return TCL_ERROR;
+    }
+    if (!p->set_inher.num_databaseNames)
+    {
+        interp->result = "no databaseNames";
+	return TCL_ERROR;
+    }
+    if (!p->cs_link)
+    {
+        interp->result = "not connected";
+	return TCL_ERROR;
+    }
+    apdu.which = Z_APDU_scanRequest;
+    apdu.u.scanRequest = &req;
+    req.referenceId = NULL;
+    req.num_databaseNames = p->set_inher.num_databaseNames;
+    req.databaseNames = p->set_inher.databaseNames;
+    req.attributeSet = oid_getoidbyent (&p->bib1);
+
+#if 0
+    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))))
+        return TCL_ERROR;
+    if (ir_strdup (interp, &req.termListAndStartPoint->term->u.general->buf,
+                   argv[2]) == TCL_ERROR)
+        return TCL_ERROR;
+    req.termListAndStartPoint->term->u.general->len = 
+        req.termListAndStartPoint->term->u.general->size = strlen(argv[2]);
+#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;
+    }
+    ccl_pr_tree (rpn, stderr);
+    fprintf (stderr, "\n");
+    if (!(req.termListAndStartPoint = ccl_scan_query (rpn)))
+        return TCL_ERROR;
+#endif
+    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))
+    {
+        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, NULL);
+    if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
+    {
+        interp->result = "cs_put failed in scan";
+        return TCL_ERROR;
+    }
+    else if (r == 1)
+    {
+        ir_select_add_write (cs_fileno(p->cs_link), p);
+        printf("Sent part of scanRequest (%d bytes).\n", p->slen);
+    }
+    else
+    {
+        printf ("Whole scan request\n");
+    }
+    return TCL_OK;
+}
+
+/*
+ * do_stepSize: Set/get replace Step Size
+ */
+static int do_stepSize (void *obj, Tcl_Interp *interp,
+                        int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->stepSize, interp, argc, argv);
+}
+
+/*
+ * do_numberOfTermsRequested: Set/get Number of Terms requested
+ */
+static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,
+                                      int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
+}
+
+
+/*
+ * do_preferredPositionInResponse: Set/get preferred Position
+ */
+static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,
+                                           int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);
+}
+
+/*
+ * do_scanStatus: Get scan status
+ */
+static int do_scanStatus (void *obj, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->scanStatus, interp, argc, argv);
+}
+
+/*
+ * do_numberOfEntriesReturned: Get number of Entries returned
+ */
+static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,
+                                       int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);
+}
+
+/*
+ * do_positionOfTerm: Get position of Term
+ */
+static int do_positionOfTerm (void *obj, Tcl_Interp *interp,
+                              int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->positionOfTerm, interp, argc, argv);
+}
+
+/*
+ * do_scanLine: get Scan Line (surrogate or normal) after response
+ */
+static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    int i;
+    char numstr[20];
+
+    if (argc != 3)
+    {
+        interp->result = "wrong # args";
+	return TCL_ERROR;
+    }
+    if (Tcl_GetInt (interp, argv[2], &i) == TCL_ERROR)
+        return TCL_ERROR;
+    if (!p->entries_flag || p->which != Z_ListEntries_entries || !p->entries
+        || i >= p->num_entries || i < 0)
+        return TCL_OK;
+    switch (p->entries[i].which)
+    {
+    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;
+    case Z_Entry_surrogateDiagnostic:
+        return 
+	    mk_nonSurrogateDiagnostics (interp, p->entries[i].u.diag.condition,
+	                                p->entries[i].u.diag.addinfo);
+	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[] = {
+    { 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}
+    };
+
+    if (argc < 2)
+    {
+        interp->result = "wrong # args";
+        return TCL_ERROR;
+    }
+    return ir_method (clientData, interp, argc, argv, tab, 0);
+}
+
+/* 
+ * ir_scan_obj_delete: IR Scan Object disposal
+ */
+static void ir_scan_obj_delete (ClientData clientData)
+{
+    free ( (void*) clientData);
+}
+
+/* 
+ * ir_scan_obj_mk: IR Scan Object creation
+ */
+static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
+                           int argc, char **argv)
+{
+    Tcl_CmdInfo parent_info;
+    IRScanObj *obj;
+
+    if (argc != 2)
+    {
+        interp->result = "wrong # args";
+        return TCL_ERROR;
+    }
+    if (get_parent_info (interp, argv[1], &parent_info, NULL) == TCL_ERROR)
+        return TCL_ERROR;
+    if (!(obj = ir_malloc (interp, sizeof(*obj))))
+        return TCL_ERROR;
+
+    obj->stepSize = 0;
+    obj->numberOfTermsRequested = 20;
+    obj->preferredPositionInResponse = 1;
+
+    obj->entries = NULL;
+    obj->nonSurrogateDiagnostics = NULL;
+
+    obj->parent = (IRObj *) parent_info.clientData;
+    Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,
+                       (ClientData) obj, ir_scan_obj_delete);
+    return TCL_OK;
+}
+
+/* ------------------------------------------------------- */
+
 static void ir_initResponse (void *obj, Z_InitResponse *initrs)
 {
+    IRObj *p = obj;
+
+    p->initResult = *initrs->result ? 1 : 0;
     if (!*initrs->result)
         printf("Connection rejected by target.\n");
     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
+
+    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;
+
+    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';
+        }
     }
-#endif
 }
 
 static void ir_handleRecords (void *o, Z_Records *zrs)
 {
     IRObj *p = o;
-    IRSetObj *setobj = p->child;
+    IRSetObj *setobj = p->set_child;
 
     setobj->which = zrs->which;
     setobj->recordFlag = 1;
@@ -1516,7 +1922,7 @@ static void ir_handleRecords (void *o, Z_Records *zrs)
 static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
 {    
     IRObj *p = o;
-    IRSetObj *setobj = p->child;
+    IRSetObj *setobj = p->set_child;
     Z_Records *zrs = searchrs->records;
 
     if (setobj)
@@ -1538,7 +1944,7 @@ static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
 static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
 {
     IRObj *p = o;
-    IRSetObj *setobj = p->child;
+    IRSetObj *setobj = p->set_child;
     Z_Records *zrs = presrs->records;
     
     printf ("Received presentResponse\n");
@@ -1551,6 +1957,95 @@ static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
     }
 }
 
+static void ir_scanResponse (void *o, Z_ScanResponse *scanrs)
+{
+    IRObj *p = o;
+    IRScanObj *scanobj = p->scan_child;
+    
+    printf ("Received scanResponse\n");
+
+    scanobj->scanStatus = *scanrs->scanStatus;
+    printf ("scanStatus=%d\n", scanobj->scanStatus);
+
+    if (scanrs->stepSize)
+        scanobj->stepSize = *scanrs->stepSize;
+    printf ("stepSize=%d\n", scanobj->stepSize);
+
+    scanobj->numberOfEntriesReturned = *scanrs->numberOfEntriesReturned;
+    printf ("numberOfEntriesReturned=%d\n", scanobj->numberOfEntriesReturned);
+
+    if (scanrs->positionOfTerm)
+        scanobj->positionOfTerm = *scanrs->positionOfTerm;
+    else
+        scanobj->positionOfTerm = -1;
+    printf ("positionOfTerm=%d\n", scanobj->positionOfTerm);
+
+    free (scanobj->entries);
+    scanobj->entries = NULL;
+    free (scanobj->nonSurrogateDiagnostics);
+    scanobj->nonSurrogateDiagnostics = NULL;
+
+    if (scanrs->entries)
+    {
+        int i;
+	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 = malloc (scanobj->num_entries * 
+	                               sizeof(*scanobj->entries));
+            for (i=0; i<scanobj->num_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)
+		    {
+                        int l = ze->u.termInfo->term->u.general->len;
+                        scanobj->entries[i].u.term.buf = malloc (1+l);
+			memcpy (scanobj->entries[i].u.term.buf, 
+			        ze->u.termInfo->term->u.general->buf,
+                                l);
+                        scanobj->entries[i].u.term.buf[l] = '\0';
+		    }
+		    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;
+                    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;
+		    break;
+		}
+	    }
+            break;
+	case Z_ListEntries_nonSurrogateDiagnostics:
+	    scanobj->num_diagRecs = scanrs->entries->
+	                          u.nonSurrogateDiagnostics->num_diagRecs;
+	    scanobj->nonSurrogateDiagnostics = malloc (scanobj->num_diagRecs *
+	                          sizeof(*scanobj->nonSurrogateDiagnostics));
+            break;
+	}
+    }
+    else
+        scanobj->entries_flag = 0;
+}
+
 /*
  * ir_select_read: handle incoming packages
  */
@@ -1592,7 +2087,7 @@ void ir_select_read (ClientData clientData)
         }        
         if (r == 1)
             return ;
-        odr_setbuf (p->odr_in, p->buf_in, r);
+        odr_setbuf (p->odr_in, p->buf_in, r, 0);
         printf ("cs_get ok, got %d\n", r);
         if (!z_APDU (p->odr_in, &apdu, 0))
         {
@@ -1613,6 +2108,9 @@ void ir_select_read (ClientData clientData)
         case Z_APDU_presentResponse:
             ir_presentResponse (p, apdu->u.presentResponse);
             break;
+        case Z_APDU_scanResponse:
+            ir_scanResponse (p, apdu->u.scanResponse);
+            break;
         default:
             printf("Received unknown APDU type (%d).\n", 
                    apdu->which);
@@ -1678,6 +2176,8 @@ int ir_tcl_init (Tcl_Interp *interp)
                        (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand (interp, "ir-set", ir_set_obj_mk,
     		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateCommand (interp, "ir-scan", ir_scan_obj_mk,
+    		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }