Windows port.
[ir-tcl-moved-to-github.git] / ir-tcl.c
index c48977c..ea7010c 100644 (file)
--- a/ir-tcl.c
+++ b/ir-tcl.c
-/*
- * IR toolkit for tcl/tk
- * (c) Index Data 1995
- * Sebastian Hammer, Adam Dickmeiss
- *
+/*\r
+ * IR toolkit for tcl/tk\r
+ * (c) Index Data 1995\r
+ * See the file LICENSE for details.\r
+ * Sebastian Hammer, Adam Dickmeiss\r
+ *\r
  * $Log: ir-tcl.c,v $
- * Revision 1.19  1995-03-28 12:45:23  adam
- * New ir method failback: called on disconnect/protocol error.
- * New ir set/get method: protocol: SR / Z3950.
- * Simple popup and disconnect when failback is invoked.
- *
- * Revision 1.18  1995/03/21  15:50:12  adam
- * Minor changes.
- *
- * Revision 1.17  1995/03/21  13:41:03  adam
- * Comstack cs_create not used too often. Non-blocking connect.
- *
- * Revision 1.16  1995/03/21  08:26:06  adam
- * New method, setName, to specify the result set name (other than Default).
- * New method, responseStatus, which returns diagnostic info, if any, after
- * present response / search response.
- *
- * Revision 1.15  1995/03/20  15:24:07  adam
- * Diagnostic records saved on searchResponse.
- *
- * Revision 1.14  1995/03/20  08:53:22  adam
- * Event loop in tclmain.c rewritten. New method searchStatus.
- *
- * Revision 1.13  1995/03/17  18:26:17  adam
- * Non-blocking i/o used now. Database names popup as cascade items.
- *
- * Revision 1.12  1995/03/17  15:45:00  adam
- * Improved target/database setup.
- *
- * Revision 1.11  1995/03/16  17:54:03  adam
- * Minor changes really.
- *
- * Revision 1.10  1995/03/15  16:14:50  adam
- * Blocking arg in cs_create changed.
- *
- * Revision 1.9  1995/03/15  13:59:24  adam
- * Minor changes.
- *
- * Revision 1.8  1995/03/15  08:25:16  adam
- * New method presentStatus to check for error on present. Misc. cleanup
- * of IRRecordList manipulations. Full MARC record presentation in
- * search.tcl.
- *
- * Revision 1.7  1995/03/14  17:32:29  adam
- * Presentation of full Marc record in popup window.
- *
- * Revision 1.6  1995/03/12  19:31:55  adam
- * Pattern matching implemented when retrieving MARC records. More
- * diagnostic functions.
- *
- * Revision 1.5  1995/03/10  18:00:15  adam
- * Actual presentation in line-by-line format. RPN query support.
- *
- * Revision 1.4  1995/03/09  16:15:08  adam
- * First presentRequest attempts. Hot-target list.
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <assert.h>
-
-#include <yaz-ccl.h>
-#include <iso2709p.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;
-
-typedef struct {
-    int type;
-    char *name;
-    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)
-{
-    IRRecordList *rl;
-
-    for (rl = setobj->record_list; rl; rl = rl->next)
-    {
-        if (no == rl->no)
-        {
-            switch (rl->which)
-            {
-            case Z_NamePlusRecord_databaseRecord:
-                iso2709_rm (rl->u.marc.rec);
-                break;
-            case Z_NamePlusRecord_surrogateDiagnostic:
-                free (rl->u.diag.addinfo);
-                rl->u.diag.addinfo = NULL;
-                break;
-            }
-            break;
-        }
-    }
-    if (!rl)
-    {
-        rl = malloc (sizeof(*rl));
-        assert (rl);
-        rl->next = setobj->record_list;
-        rl->no = no;
-        setobj->record_list = rl;
-    }
-    rl->which = which;
-    return rl;
-}
-
-static IRRecordList *find_IR_record (IRSetObj *setobj, int no)
-{
-    IRRecordList *rl;
-
-    for (rl = setobj->record_list; rl; rl = rl->next)
-        if (no == rl->no)
-            return rl;
-    return NULL;
-}
-
-/*
- * get_parent_info: Returns information about parent object.
- */
-static int get_parent_info (Tcl_Interp *interp, const char *name,
-                           Tcl_CmdInfo *parent_info)
-{
-    char parent_name[128];
-    const char *csep = strrchr (name, '.');
-    int pos;
-
-    if (!csep)
-    {
-        interp->result = "missing .";
-        return TCL_ERROR;
-    }
-    pos = csep-name;
-    if (pos > 127)
-        pos = 127;
-    memcpy (parent_name, name, pos);
-    parent_name[pos] = '\0';
-    if (!Tcl_GetCommandInfo (interp, parent_name, parent_info))
-    {
-        interp->result = "No parent";
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- * ir_method: Search for method in table and invoke method handler
- */
-int ir_method (void *obj, Tcl_Interp *interp, int argc, char **argv,
-               IRMethod *tab)
-{
-    IRMethod *t;
-    for (t = tab; t->name; t++)
-        if (!strcmp (t->name, argv[1]))
-            return (*t->method)(obj, interp, argc, argv);
-    Tcl_AppendResult (interp, "Bad method. Possible values:", NULL);
-    for (t = tab; t->name; t++)
-        Tcl_AppendResult (interp, " ", t->name, NULL);
-    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,
-                 IRMethod *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_asc2bitmask: Ascii to ODR bitmask conversion
- */
-int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
-{
-    const char *cp = asc + strlen(asc);
-    int bitno = 0;
-
-    ODR_MASK_ZERO (ob);
-    do 
-    {
-        if (*--cp == '1')
-            ODR_MASK_SET (ob, bitno);
-        bitno++;
-    } while (cp != asc);
-    return bitno;
-}
-
-/*
- * ir_strdup: Duplicate string
- */
-int ir_strdup (Tcl_Interp *interp, char** p, char *s)
-{
-    *p = malloc (strlen(s)+1);
-    if (!*p)
-    {
-        interp->result = "strdup fail";
-        return TCL_ERROR;
-    }
-    strcpy (*p, s);
-    return TCL_OK;
-}
-
-/*
- * ir_malloc: Malloc function
- */
-void *ir_malloc (Tcl_Interp *interp, size_t size)
-{
-    static char buf[128];
-    void *p = malloc (size);
-
-    if (!p)
-    {
-        sprintf (buf, "Malloc fail. %ld bytes requested", (long) size);
-        interp->result = buf;
-        return NULL;
-    }
-    return p;
-}
-
-/* ------------------------------------------------------- */
-
-/*
- * do_init_request: init method on IR object
- */
-static int do_init_request (void *obj, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    Z_APDU apdu, *apdup;
-    IRObj *p = obj;
-    Z_InitRequest req;
-    int r;
-
-    req.referenceId = 0;
-    req.options = &p->options;
-    req.protocolVersion = &p->protocolVersion;
-    req.preferredMessageSize = &p->preferredMessageSize;
-    req.maximumRecordSize = &p->maximumRecordSize;
-
-    req.idAuthentication = p->idAuthentication;
-    req.implementationId = p->implementationId;
-    req.implementationName = p->implementationName;
-    req.implementationVersion = "0.1";
-    req.userInformationField = 0;
-
-    apdu.u.initRequest = &req;
-    apdu.which = Z_APDU_initRequest;
-    apdup = &apdu;
-
-    if (!z_APDU (p->odr_out, &apdup, 0))
-    {
-        Tcl_AppendResult (interp, odr_errlist [odr_geterror (p->odr_out)],
-                          NULL);
-        odr_reset (p->odr_out);
-        return TCL_ERROR;
-    }
-    p->sbuf = odr_getbuf (p->odr_out, &p->slen);
-    if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
-    {     
-        interp->result = "cs_put failed in init";
-        return TCL_ERROR;
-    }
-    else if (r == 1)
-    {
-        ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf("Sent part of initializeRequest (%d bytes).\n", p->slen);
-    }
-    else
-        printf("Sent whole initializeRequest (%d bytes).\n", p->slen);
-    return TCL_OK;
-}
-
-/*
- * do_protocolVersion: Set protocol Version
- */
-static int do_protocolVersion (void *obj, Tcl_Interp *interp,
-                               int argc, char **argv)
-{
-    if (argc == 3)
-        ir_asc2bitmask (argv[2], &((IRObj *) obj)->protocolVersion);
-    return TCL_OK;
-}
-
-/*
- * do_options: Set options
- */
-static int do_options (void *obj, Tcl_Interp *interp,
-                       int argc, char **argv)
-{
-    if (argc == 3)
-        ir_asc2bitmask (argv[2], &((IRObj *) obj)->options);
-    return TCL_OK;
-}
-
-/*
- * do_preferredMessageSize: Set/get preferred message size
- */
-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;
-}
-
-/*
- * do_maximumRecordSize: Set/get maximum record size
- */
-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;
-}
-
-
-/*
- * do_implementationName: Set/get Implementation Name.
- */
-static int do_implementationName (void *obj, Tcl_Interp *interp,
-                                    int argc, char **argv)
-{
-    if (argc == 3)
-    {
-        free (((IRObj*)obj)->implementationName);
-        if (ir_strdup (interp, &((IRObj*) obj)->implementationName, argv[2])
-            == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->implementationName,
-                      (char*) NULL);
-    return TCL_OK;
-}
-
-/*
- * do_implementationId: Set/get Implementation Id.
- */
-static int do_implementationId (void *obj, Tcl_Interp *interp,
-                                int argc, char **argv)
-{
-    if (argc == 3)
-    {
-        free (((IRObj*)obj)->implementationId);
-        if (ir_strdup (interp, &((IRObj*) obj)->implementationId, argv[2])
-            == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->implementationId,
-                      (char*) NULL);
-    return TCL_OK;
-}
-
-/*
- * do_idAuthentication: Set/get id Authentication
- */
-static int do_idAuthentication (void *obj, Tcl_Interp *interp,
-                                int argc, char **argv)
-{
-    if (argc == 3)
-    {
-        free (((IRObj*)obj)->idAuthentication);
-        if (ir_strdup (interp, &((IRObj*) obj)->idAuthentication, argv[2])
-            == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendResult (interp, ((IRObj*)obj)->idAuthentication,
-                      (char*) NULL);
-    return TCL_OK;
-}
-
-/*
- * do_connect: connect method on IR object
- */
-static int do_connect (void *obj, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    void *addr;
-    IRObj *p = obj;
-    int r;
-    int protocol_type = CS_Z3950;
-
-    if (argc == 3)
-    {
-        if (p->hostname)
-        {
-            interp->result = "already connected";
-            return TCL_ERROR;
-        }
-        if (!strcmp (p->protocol_type, "Z3950"))
-            protocol_type = CS_Z3950;
-        else if (!strcmp (p->protocol_type, "SR"))
-            protocol_type = CS_SR;
-        else
-        {
-            interp->result = "bad protocol type";
-            return TCL_ERROR;
-        }
-        if (!strcmp (p->cs_type, "tcpip"))
-        {
-            p->cs_link = cs_create (tcpip_type, CS_BLOCK, protocol_type);
-            addr = tcpip_strtoaddr (argv[2]);
-            if (!addr)
-            {
-                interp->result = "tcpip_strtoaddr fail";
-                return TCL_ERROR;
-            }
-            printf ("tcp/ip connect %s\n", argv[2]);
-        }
-#if MOSI
-        else if (!strcmp (p->cs_type, "mosi"))
-        {
-            p->cs_link = cs_create (mosi_type, CS_BLOCK, protocol_type);
-            addr = mosi_strtoaddr (argv[2]);
-            if (!addr)
-            {
-                interp->result = "mosi_strtoaddr fail";
-                return TCL_ERROR;
-            }
-            printf ("mosi connect %s\n", argv[2]);
-        }
-#endif
-        else 
-        {
-            interp->result = "unknown comstack type";
-            return TCL_ERROR;
-        }
-        if (ir_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-        if ((r=cs_connect (p->cs_link, addr)) < 0)
-        {
-            interp->result = "cs_connect fail";
-            return TCL_ERROR;
-        }
-        ir_select_add (cs_fileno (p->cs_link), p);
-        if (r == 1)
-        {
-            ir_select_add_write (cs_fileno (p->cs_link), p);
-            p->connectFlag = 1;
-        }
-        else
-        {
-            p->connectFlag = 0;
-            if (p->callback)
-                Tcl_Eval (p->interp, p->callback);
-        }
-    }
-    Tcl_AppendElement (interp, p->hostname);
-    return TCL_OK;
-}
-
-/*
- * do_disconnect: disconnect method on IR object
- */
-static int do_disconnect (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    IRObj *p = obj;
-
-    if (p->hostname)
-    {
-        free (p->hostname);
-        p->hostname = NULL;
-        ir_select_remove (cs_fileno (p->cs_link), p);
-
-        assert (p->cs_link);
-        cs_close (p->cs_link);
-        p->cs_link = NULL;
-    }
-    return TCL_OK;
-}
-
-/*
- * do_comstack: Set/get comstack method on IR object
- */
-static int do_comstack (void *o, Tcl_Interp *interp,
-                       int argc, char **argv)
-{
-    IRObj *obj = o;
-
-    if (argc == 3)
-    {
-        free (obj->cs_type);
-        if (ir_strdup (interp, &obj->cs_type, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendElement (interp, obj->cs_type);
-    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)
-{
-    IRObj *obj = o;
-
-    if (argc == 3)
-    {
-        free (obj->protocol_type);
-        if (ir_strdup (interp, &obj->protocol_type, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendElement (interp, obj->protocol_type);
-    return TCL_OK;
-}
-
-/*
- * do_callback: add callback
- */
-static int do_callback (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    IRObj *p = obj;
-
-    if (argc == 3)
-    {
-        free (p->callback);
-        if (ir_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-        p->interp = interp;
-    }
-    return TCL_OK;
-}
-
-/*
- * do_failback: add error handle callback
- */
-static int do_failback (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    IRObj *p = obj;
-
-    if (argc == 3)
-    {
-        free (p->failback);
-        if (ir_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-        p->interp = interp;
-    }
-    return TCL_OK;
-}
-
-/*
- * do_databaseNames: specify database names
- */
-static int do_databaseNames (void *obj, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    int i;
-    IRObj *p = obj;
-
-    if (argc < 3)
-    {
-        for (i=0; i<p->num_databaseNames; i++)
-            Tcl_AppendElement (interp, p->databaseNames[i]);
-        return TCL_OK;
-    }
-    if (p->databaseNames)
-    {
-        for (i=0; i<p->num_databaseNames; i++)
-            free (p->databaseNames[i]);
-        free (p->databaseNames);
-    }
-    p->num_databaseNames = argc - 2;
-    if (!(p->databaseNames = ir_malloc (interp, 
-          sizeof(*p->databaseNames) * p->num_databaseNames)))
-        return TCL_ERROR;
-    for (i=0; i<p->num_databaseNames; i++)
-    {
-        if (ir_strdup (interp, &p->databaseNames[i], argv[2+i]) 
-            == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- * do_query: Set/Get query mothod
- */
-static int do_query (void *obj, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    IRObj *p = obj;
-    if (argc == 3)
-    {
-        free (p->query_method);
-        if (ir_strdup (interp, &p->query_method, argv[2]) == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendResult (interp, p->query_method, NULL);
-    return TCL_OK;
-}
-
-/*
- * do_replaceIndicator: Set/get replace Set indicator
- */
-static int do_replaceIndicator (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);
-    return TCL_OK;
-}
-
-/* 
- * ir_obj_method: IR Object methods
- */
-static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    static IRMethod tab[] = {
-    { 1, "comstack",                do_comstack },
-    { 1, "protocol",                do_protocol },
-    { 1, "connect",                 do_connect },
-    { 0, "protocolVersion",         do_protocolVersion },
-    { 0, "options",                 do_options },
-    { 1, "preferredMessageSize",    do_preferredMessageSize },
-    { 1, "maximumRecordSize",       do_maximumRecordSize },
-    { 1, "implementationName",      do_implementationName },
-    { 1, "implementationId",        do_implementationId },
-    { 1, "idAuthentication",        do_idAuthentication },
-    { 0, "init",                    do_init_request },
-    { 0, "disconnect",              do_disconnect },
-    { 0, "callback",                do_callback },
-    { 0, "failback",                do_failback },
-    { 1, "databaseNames",           do_databaseNames},
-    { 1, "replaceIndicator",        do_replaceIndicator},
-    { 1, "query",                   do_query },
-    { 0, NULL, NULL}
-    };
-    if (argc < 2)
-        return ir_method_r (clientData, interp, argc, argv, tab);
-    return ir_method (clientData, interp, argc, argv, tab);
-}
-
-/* 
- * ir_obj_delete: IR Object disposal
- */
-static void ir_obj_delete (ClientData clientData)
-{
-    free ( (void*) clientData);
-}
-
-/* 
- * ir_obj_mk: IR Object creation
- */
-static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
-              int argc, char **argv)
-{
-    IRObj *obj;
-    FILE *inf;
-
-    if (argc != 2)
-    {
-        interp->result = "wrong # args";
-        return TCL_ERROR;
-    }
-    if (!(obj = ir_malloc (interp, sizeof(*obj))))
-        return TCL_ERROR;
-    if (ir_strdup (interp, &obj->cs_type, "tcpip") == TCL_ERROR)
-        return TCL_ERROR;
-    if (ir_strdup (interp, &obj->protocol_type, "Z3950") == TCL_ERROR)
-        return TCL_ERROR;
-    obj->cs_link = NULL;
-
-    obj->maximumRecordSize = 32768;
-    obj->preferredMessageSize = 4096;
-    obj->connectFlag = 0;
-
-    obj->idAuthentication = NULL;
-
-    if (ir_strdup (interp, &obj->implementationName, "TCL/TK on YAZ")
-        == TCL_ERROR)
-        return TCL_ERROR;
-
-    if (ir_strdup (interp, &obj->implementationId, "TCL/TK/YAZ")
-        == TCL_ERROR)
-        return TCL_ERROR;
-    
-    obj->smallSetUpperBound = 0;
-    obj->largeSetLowerBound = 2;
-    obj->mediumSetPresentNumber = 0;
-    obj->replaceIndicator = 1;
-    obj->databaseNames = NULL;
-    obj->num_databaseNames = 0; 
-
-    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")))
-    {
-       ccl_qual_file (obj->bibset, inf);
-       fclose (inf);
-    }
-    ODR_MASK_ZERO (&obj->protocolVersion);
-    ODR_MASK_SET (&obj->protocolVersion, 0);
-    ODR_MASK_SET (&obj->protocolVersion, 1);
-
-    ODR_MASK_ZERO (&obj->options);
-    ODR_MASK_SET (&obj->options, 0);
-
-    obj->odr_in = odr_createmem (ODR_DECODE);
-    obj->odr_out = odr_createmem (ODR_ENCODE);
-    obj->odr_pr = odr_createmem (ODR_PRINT);
-
-    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);
-
-    obj->len_in = 0;
-    obj->buf_in = NULL;
-
-    obj->callback = NULL;
-    obj->failback = NULL;
-    Tcl_CreateCommand (interp, argv[1], ir_obj_method,
-                       (ClientData) obj, ir_obj_delete);
-    return TCL_OK;
-}
-
-/* ------------------------------------------------------- */
-/*
- * do_search: Do search request
- */
-static int do_search (void *o, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    Z_SearchRequest req;
-    Z_Query query;
-    Z_APDU apdu, *apdup;
-    static Odr_oid bib1[] = {1, 2, 840, 10003, 3, 1, -1};
-    Odr_oct ccl_query;
-    IRSetObj *obj = o;
-    IRObj *p = obj->parent;
-    int r;
-
-    p->child = o;
-    if (argc != 3)
-    {
-        interp->result = "wrong # args";
-        return TCL_ERROR;
-    }
-    if (!p->num_databaseNames)
-    {
-        interp->result = "no databaseNames";
-        return TCL_ERROR;
-    }
-    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.resultSetName = obj->setName ? obj->setName : "Default";
-    req.num_databaseNames = p->num_databaseNames;
-    req.databaseNames = p->databaseNames;
-    printf ("Search:");
-    for (r=0; r<p->num_databaseNames; r++)
-    {
-        printf (" %s", p->databaseNames[r]);
-    }
-    req.smallSetElementSetNames = 0;
-    req.mediumSetElementSetNames = 0;
-    req.preferredRecordSyntax = 0;
-    req.query = &query;
-
-    if (!strcmp (p->query_method, "rpn"))
-    {
-        int error;
-        int pos;
-        struct ccl_rpn_node *rpn;
-        Z_RPNQuery *RPNquery;
-
-        rpn = ccl_find_str(p->bibset, argv[2], &error, &pos);
-        if (error)
-        {
-            Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg(error),NULL);
-            return TCL_ERROR;
-        }
-        query.which = Z_Query_type_1;
-        assert((RPNquery = ccl_rpn_query(rpn)));
-        RPNquery->attributeSetId = bib1;
-        query.u.type_1 = RPNquery;
-        printf ("- RPN\n");
-    }
-    else if (!strcmp (p->query_method, "ccl"))
-    {
-        query.which = Z_Query_type_2;
-        query.u.type_2 = &ccl_query;
-        ccl_query.buf = (unsigned char *) argv[2];
-        ccl_query.len = strlen (argv[2]);
-        printf ("- CCL\n");
-    }
-    else
-    {
-        interp->result = "unknown query method";
-        return TCL_ERROR;
-    }
-    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);
-    if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
-    {
-        interp->result = "cs_put failed in init";
-        return TCL_ERROR;
-    }
-    else if (r == 1)
-    {
-        ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf("Sent part of searchRequest (%d bytes).\n", p->slen);
-    }
-    else
-    {
-        printf ("Whole search request\n");
-    }
-    return TCL_OK;
-}
-
-/*
- * do_resultCount: Get number of hits
- */
-static int do_resultCount (void *o, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    IRSetObj *obj = o;
-
-    sprintf (interp->result, "%d", obj->resultCount);
-    return TCL_OK;
-}
-
-/*
- * do_searchStatus: Get search status (after search response)
- */
-static int do_searchStatus (void *o, Tcl_Interp *interp,
-                           int argc, char **argv)
-{
-    IRSetObj *obj = o;
-
-    sprintf (interp->result, "%d", obj->searchStatus);
-    return TCL_OK;
-}
-
-/*
- * do_setName: Set result Set name
- */
-static int do_setName (void *o, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    IRSetObj *obj = o;
-
-    if (argc == 3)
-    {
-        free (obj->setName);
-        if (ir_strdup (interp, &obj->setName, argv[2])
-            == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    Tcl_AppendElement (interp, obj->setName);
-    return TCL_OK;
-}
-
-/*
- * do_numberOfRecordsReturned: Get number of records returned
- */
-static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
-                      int argc, char **argv)
-{
-    IRSetObj *obj = o;
-
-    sprintf (interp->result, "%d", obj->numberOfRecordsReturned);
-    return TCL_OK;
-}
-
-static int marc_cmp (const char *field, const char *pattern)
-{
-    if (*pattern == '*')
-        return 0;
-    for (; *field && *pattern; field++, pattern++)
-    {
-        if (*pattern == '?')
-            continue;
-        if (*pattern != *field)
-            break;
-    }
-    return *field - *pattern;
-}
-
-static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
-                           int argc, char **argv)
-{
-    struct iso2709_dir *dir;
-    struct iso2709_field *field;
-
-    for (dir = rec->directory; dir; dir = dir->next)
-    {
-        if (argc > 4 && marc_cmp (dir->tag, argv[4]))
-            continue;
-        if (argc > 5 && marc_cmp (dir->indicator, argv[5]))
-            continue;
-        for (field = dir->fields; field; field = field->next)
-        {
-            if (argc > 6 && marc_cmp (field->identifier, argv[6]))
-                continue;
-            Tcl_AppendElement (interp, field->data);
-        }
-    }
-    return TCL_OK;
-}
-
-static int get_marc_lines (Tcl_Interp *interp, Iso2709Rec rec,
-                           int argc, char **argv)
-{
-    struct iso2709_dir *dir;
-    struct iso2709_field *field;
-    
-    for (dir = rec->directory; dir; dir = dir->next)
-    {
-        if (argc > 4 && marc_cmp (dir->tag, argv[4]))
-            continue;
-        if (!dir->indicator)
-            Tcl_AppendResult (interp, "{", dir->tag, " {} {", NULL);
-        else
-        {
-            if (argc > 5 && marc_cmp (dir->indicator, argv[5]))
-                continue;
-            Tcl_AppendResult (interp, "{", dir->tag, " {", dir->indicator, 
-                              "} {", NULL);
-        }
-        for (field = dir->fields; field; field = field->next)
-        {
-            if (!field->identifier)
-                Tcl_AppendResult (interp, "{{}", NULL);
-            else
-            {
-                if (argc > 6 && marc_cmp (field->identifier, argv[6]))
-                    continue;
-                Tcl_AppendResult (interp, "{", field->identifier, NULL);
-            }
-            Tcl_AppendElement (interp, field->data);
-            Tcl_AppendResult (interp, "} ", NULL);
-        }
-        Tcl_AppendResult (interp, "}} ", NULL);
-    }
-    return TCL_OK;
-}
-
-/*
- * do_recordType: Return record type (if any) at position.
- */
-static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
-{
-    IRSetObj *obj = o;
-    int offset;
-    IRRecordList *rl;
-
-    if (argc < 3)
-    {
-        sprintf (interp->result, "wrong # args");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
-        return TCL_ERROR;
-    rl = find_IR_record (obj, offset);
-    if (!rl)
-        return TCL_OK;
-    switch (rl->which)
-    {
-    case Z_NamePlusRecord_databaseRecord:
-        interp->result = "databaseRecord";
-        break;
-    case Z_NamePlusRecord_surrogateDiagnostic:
-        interp->result = "surrogateDiagnostic";
-        break;
-    }
-    return TCL_OK;
-}
-
-/*
- * do_recordDiag: Return diagnostic record info
- */
-static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
-{
-    IRSetObj *obj = o;
-    int offset;
-    IRRecordList *rl;
-    char buf[20];
-
-    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_surrogateDiagnostic)
-    {
-        Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
-        return TCL_ERROR;
-    }
-    sprintf (buf, "%d", rl->u.diag.condition);
-    Tcl_AppendResult (interp, buf, " {", 
-                      (rl->u.diag.addinfo ? rl->u.diag.addinfo : ""),
-                      "}", NULL);
-    return TCL_OK;
-}
-
-/*
- * do_recordMarc: Get ISO2709 Record lines/fields
- */
-static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
-{
-    IRSetObj *obj = o;
-    int offset;
-    IRRecordList *rl;
-
-    if (argc < 4)
-    {
-        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 MARC record at #", argv[2], NULL);
-        return TCL_ERROR;
-    }
-    if (!strcmp (argv[3], "field"))
-        return get_marc_fields (interp, rl->u.marc.rec, argc, argv);
-    else if (!strcmp (argv[3], "line"))
-        return get_marc_lines (interp, rl->u.marc.rec, argc, argv);
-    else
-    {
-        Tcl_AppendResult (interp, "field/line expected", NULL);
-        return TCL_ERROR;
-    }
-}
-
-/*
- * do_responseStatus: Return response status (present or search)
- */
-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)
-        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 TCL_OK;
-}
-
-/*
- * do_present: Perform Present Request
- */
-
-static int do_present (void *o, Tcl_Interp *interp,
-                       int argc, char **argv)
-{
-    IRSetObj *obj = o;
-    IRObj *p = obj->parent;
-    Z_APDU apdu, *apdup;
-    Z_PresentRequest req;
-    int start;
-    int number;
-    int r;
-
-    if (argc >= 3)
-    {
-        if (Tcl_GetInt (interp, argv[2], &start) == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    else
-        start = 1;
-    if (argc >= 4)
-    {
-        if (Tcl_GetInt (interp, argv[3], &number) == TCL_ERROR)
-            return TCL_ERROR;
-    }
-    else 
-        number = 10;
-    obj->start = start;
-    obj->number = number;
-
-    apdup = &apdu;
-    apdu.which = Z_APDU_presentRequest;
-    apdu.u.presentRequest = &req;
-    req.referenceId = 0;
-    /* sprintf(setstring, "%d", setnumber); */
-    req.resultSetId = "Default";
-    req.resultSetStartPoint = &start;
-    req.numberOfRecordsRequested = &number;
-    req.elementSetNames = 0;
-    req.preferredRecordSyntax = 0;
-
-    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);
-    if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
-    {
-        interp->result = "cs_put failed in init";
-        return TCL_ERROR;
-    }
-    else if (r == 1)
-    {
-        ir_select_add_write (cs_fileno(p->cs_link), p);
-        printf ("Part of present request, start=%d, num=%d (%d bytes)\n",
-                start, number, p->slen);
-    }
-    else
-    {
-        printf ("Whole present request, start=%d, num=%d (%d bytes)\n",
-                start, number, p->slen);
-    }
-    return TCL_OK;
-}
-
-/*
- * do_loadFile: Load result set from file
- */
-
-static int do_loadFile (void *o, Tcl_Interp *interp,
-                        int argc, char **argv)
-{
-    IRSetObj *setobj = o;
-    FILE *inf;
-    int  no = 1;
-    const char *buf;
-
-    if (argc < 3)
-    {
-        interp->result = "wrong # args";
-        return TCL_ERROR;
-    }
-    inf = fopen (argv[2], "r");
-    if (!inf)
-    {
-        Tcl_AppendResult (interp, "Cannot open ", argv[2], NULL);
-        return TCL_ERROR;
-    }
-    while ((buf = iso2709_read (inf)))
-    {
-        IRRecordList *rl;
-        Iso2709Rec rec;
-
-        rec = iso2709_cvt (buf);
-        if (!rec)
-            break;
-        rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord);
-        rl->u.marc.rec = rec;
-        no++;
-    }
-    setobj->numberOfRecordsReturned = no-1;
-    fclose (inf);
-    return TCL_OK;
-}
-
-
-/* 
- * ir_set_obj_method: IR Set Object methods
- */
-static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
-                          int argc, char **argv)
-{
-    static IRMethod tab[] = {
-    { 0, "search",                  do_search },
-    { 0, "searchStatus",            do_searchStatus },
-    { 0, "setName",                 do_setName },
-    { 0, "resultCount",             do_resultCount },
-    { 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },
-    { 0, "present",                 do_present },
-    { 0, "recordType",              do_recordType },
-    { 0, "recordMarc",              do_recordMarc },
-    { 0, "recordDiag",              do_recordDiag },
-    { 0, "responseStatus",          do_responseStatus },
-    { 0, "loadFile",                do_loadFile },
-    { 0, NULL, NULL}
-    };
-
-    if (argc < 2)
-    {
-        interp->result = "wrong # args";
-        return TCL_ERROR;
-    }
-    return ir_method (clientData, interp, argc, argv, tab);
-}
-
-/* 
- * ir_set_obj_delete: IR Set Object disposal
- */
-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)
-    {
-        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))))
-        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;
-}
-
-/* ------------------------------------------------------- */
-
-static void ir_initResponse (void *obj, Z_InitResponse *initrs)
-{
-    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
-    if (initrs->userInformationField)
-    {
-        printf("UserInformationfield:\n");
-        odr_external(&print, (Odr_external**)&initrs->
-                         userInformationField, 0);
-    }
-#endif
-}
-
-static void ir_handleRecords (void *o, Z_Records *zrs)
-{
-    IRObj *p = o;
-    IRSetObj *setobj = p->child;
-
-    setobj->which = zrs->which;
-    setobj->recordFlag = 1;
-    if (zrs->which == Z_Records_NSD)
-    {
-        const char *addinfo;
-        
-        setobj->numberOfRecordsReturned = 0;
-        setobj->condition = *zrs->u.nonSurrogateDiagnostic->condition;
-        free (setobj->addinfo);
-        setobj->addinfo = NULL;
-        addinfo = zrs->u.nonSurrogateDiagnostic->addinfo;
-        if (addinfo && (setobj->addinfo = malloc (strlen(addinfo) + 1)))
-            strcpy (setobj->addinfo, addinfo);
-        printf ("Diagnostic response. %s (%d): %s\n",
-                diagbib1_str (setobj->condition),
-                setobj->condition,
-                setobj->addinfo ? setobj->addinfo : "");
-    }
-    else
-    {
-        int offset;
-        IRRecordList *rl;
-        
-        setobj->numberOfRecordsReturned = 
-            zrs->u.databaseOrSurDiagnostics->num_records;
-        printf ("Got %d records\n", setobj->numberOfRecordsReturned);
-        for (offset = 0; offset<setobj->numberOfRecordsReturned; offset++)
-        {
-            rl = new_IR_record (setobj, setobj->start + offset,
-                                zrs->u.databaseOrSurDiagnostics->
-                                records[offset]->which);
-            if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
-            {
-                Z_DiagRec *diagrec;
-                
-                diagrec = zrs->u.databaseOrSurDiagnostics->
-                    records[offset]->u.surrogateDiagnostic;
-                
-                rl->u.diag.condition = *diagrec->condition;
-                if (diagrec->addinfo && (rl->u.diag.addinfo =
-                                         malloc (strlen (diagrec->addinfo)+1)))
-                    strcpy (rl->u.diag.addinfo, diagrec->addinfo);
-            }
-            else
-            {
-                Z_DatabaseRecord *zr; 
-                Odr_external *oe;
-                
-                zr = zrs->u.databaseOrSurDiagnostics->records[offset]
-                    ->u.databaseRecord;
-                oe = (Odr_external*) zr;
-                if (oe->which == ODR_EXTERNAL_octet
-                    && zr->u.octet_aligned->len)
-                {
-                    const char *buf = (char*) zr->u.octet_aligned->buf;
-                    rl->u.marc.rec = iso2709_cvt (buf);
-                }
-                else
-                    rl->u.marc.rec = NULL;
-            }
-        }
-    }
-}
-
-static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
-{    
-    IRObj *p = o;
-    IRSetObj *setobj = p->child;
-    Z_Records *zrs = searchrs->records;
-
-    if (setobj)
-    {
-        setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
-        setobj->resultCount = *searchrs->resultCount;
-        printf ("Search response %d, %d hits\n", 
-                 setobj->searchStatus, setobj->resultCount);
-        if (zrs)
-            ir_handleRecords (o, zrs);
-        else
-            setobj->recordFlag = 0;
-    }
-    else
-        printf ("Search response, no object!\n");
-}
-
-
-static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
-{
-    IRObj *p = o;
-    IRSetObj *setobj = p->child;
-    Z_Records *zrs = presrs->records;
-    
-    printf ("Received presentResponse\n");
-    if (zrs)
-        ir_handleRecords (o, zrs);
-    else
-    {
-        setobj->recordFlag = 0;
-        printf ("No records!\n");
-    }
-}
-
-/*
- * ir_select_read: handle incoming packages
- */
-void ir_select_read (ClientData clientData)
-{
-    IRObj *p = clientData;
-    Z_APDU *apdu;
-    int r;
-
-    if (p->connectFlag)
-    {
-        r = cs_rcvconnect (p->cs_link);
-        if (r == 1)
-            return;
-        p->connectFlag = 0;
-        ir_select_remove_write (cs_fileno (p->cs_link), p);
-        if (r < 0)
-        {
-            printf ("cs_rcvconnect error\n");
-            if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            return;
-        }
-        if (p->callback)
-           Tcl_Eval (p->interp, p->callback);
-        return;
-    }
-    do
-    {
-        if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in))  <= 0)
-        {
-            printf ("cs_get failed\n");
-            ir_select_remove (cs_fileno (p->cs_link), p);
-            if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            return;
-        }        
-        if (r == 1)
-            return ;
-        odr_setbuf (p->odr_in, p->buf_in, r);
-        printf ("cs_get ok, got %d\n", r);
-        if (!z_APDU (p->odr_in, &apdu, 0))
-        {
-            printf ("%s\n", odr_errlist [odr_geterror (p->odr_in)]);
-            if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            return;
-        }
-        switch(apdu->which)
-        {
-        case Z_APDU_initResponse:
-            ir_initResponse (p, apdu->u.initResponse);
-            break;
-        case Z_APDU_searchResponse:
-            ir_searchResponse (p, apdu->u.searchResponse);
-            break;
-        case Z_APDU_presentResponse:
-            ir_presentResponse (p, apdu->u.presentResponse);
-            break;
-        default:
-            printf("Received unknown APDU type (%d).\n", 
-                   apdu->which);
-            if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-        }
-        if (p->callback)
-           Tcl_Eval (p->interp, p->callback);
-    } while (cs_more (p->cs_link));    
-}
-
-/*
- * ir_select_write: handle outgoing packages - not yet written.
- */
-void ir_select_write (ClientData clientData)
-{
-    IRObj *p = clientData;
-    int r;
-
-    printf ("In write handler.....\n");
-    if (p->connectFlag)
-    {
-        r = cs_rcvconnect (p->cs_link);
-        if (r == 1)
-            return;
-        p->connectFlag = 0;
-        if (r < 0)
-        {
-            printf ("cs_rcvconnect error\n");
-            ir_select_remove_write (cs_fileno (p->cs_link), p);
-            if (p->failback)
-                Tcl_Eval (p->interp, p->failback);
-            return;
-        }
-        ir_select_remove_write (cs_fileno (p->cs_link), p);
-        if (p->callback)
-           Tcl_Eval (p->interp, p->callback);
-        return;
-    }
-    if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
-    {   
-        printf ("select write fail\n");
-        cs_close (p->cs_link);
-        if (p->failback)
-            Tcl_Eval (p->interp, p->failback);
-    }
-    else if (r == 0)            /* remove select bit */
-    {
-        ir_select_remove_write (cs_fileno (p->cs_link), p);
-    }
-}
-
-/* ------------------------------------------------------- */
-
-/*
- * ir_tcl_init: Registration of TCL commands.
- */
-int ir_tcl_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);
-    return TCL_OK;
-}
-
-
+ * Revision 1.65  1995-11-28 13:53:00  quinn
+ * Windows port.
+ *\r
+ * Revision 1.64  1995/11/13  15:39:18  adam\r
+ * Bug fix: {small,medium}SetElementSetNames weren't set correctly.\r
+ * Bug fix: idAuthentication weren't set correctly.\r
+ *\r
+ * Revision 1.63  1995/11/13  09:55:39  adam\r
+ * Multiple records at a position in a result-set with differnt\r
+ * element specs.\r
+ *\r
+ * Revision 1.62  1995/10/18  17:20:33  adam\r
+ * Work on target setup in client.tcl.\r
+ *\r
+ * Revision 1.61  1995/10/18  16:42:42  adam\r
+ * New settings: smallSetElementSetNames and mediumSetElementSetNames.\r
+ *\r
+ * Revision 1.60  1995/10/18  15:43:31  adam\r
+ * In search: mediumSetElementSetNames and smallSetElementSetNames are\r
+ * set to elementSetNames.\r
+ *\r
+ * Revision 1.59  1995/10/17  12:18:58  adam\r
+ * Bug fix: when target connection closed, the connection was not\r
+ * properly reestablished.\r
+ *\r
+ * Revision 1.58  1995/10/16  17:00:55  adam\r
+ * New setting: elementSetNames.\r
+ * Various client improvements. Medium presentation format looks better.\r
+ *\r
+ * Revision 1.57  1995/09/21  13:11:51  adam\r
+ * Support of dynamic loading.\r
+ * Test script uses load command if necessary.\r
+ *\r
+ * Revision 1.56  1995/08/29  15:30:14  adam\r
+ * Work on GRS records.\r
+ *\r
+ * Revision 1.55  1995/08/28  09:43:25  adam\r
+ * Minor changes. configure only searches for yaz beta 3 and versions after\r
+ * that.\r
+ *\r
+ * Revision 1.54  1995/08/24  12:25:16  adam\r
+ * Modified to work with yaz 1.0b3.\r
+ *\r
+ * Revision 1.53  1995/08/04  12:49:26  adam\r
+ * Bug fix: reading uninitialized variable p.\r
+ *\r
+ * Revision 1.52  1995/08/04  11:32:38  adam\r
+ * More work on output queue. Memory related routines moved\r
+ * to mem.c\r
+ *\r
+ * Revision 1.51  1995/08/03  13:22:54  adam\r
+ * Request queue.\r
+ *\r
+ * Revision 1.50  1995/07/20  08:09:49  adam\r
+ * client.tcl: Targets removed from hotTargets list when targets\r
+ *  are removed/modified.\r
+ * ir-tcl.c: More work on triggerResourceControl.\r
+ *\r
+ * Revision 1.49  1995/06/30  12:39:21  adam\r
+ * Bug fix: loadFile didn't set record type.\r
+ * The MARC routines are a little less strict in the interpretation.\r
+ * Script display.tcl replaces the old marc.tcl.\r
+ * New interactive script: shell.tcl.\r
+ *\r
+ * Revision 1.48  1995/06/27  19:03:50  adam\r
+ * Bug fix in do_present in ir-tcl.c: p->set_child member weren't set.\r
+ * nextResultSetPosition used instead of setOffset.\r
+ *\r
+ * Revision 1.47  1995/06/25  10:25:04  adam\r
+ * Working on triggerResourceControl. Description of compile/install\r
+ * procedure moved to ir-tcl.sgml.\r
+ *\r
+ * Revision 1.46  1995/06/22  13:15:06  adam\r
+ * Feature: SUTRS. Setting getSutrs implemented.\r
+ * Work on display formats.\r
+ * Preferred record syntax can be set by the user.\r
+ *\r
+ * Revision 1.45  1995/06/20  08:07:30  adam\r
+ * New setting: failInfo.\r
+ * Working on better cancel mechanism.\r
+ *\r
+ * Revision 1.44  1995/06/19  17:01:20  adam\r
+ * Minor changes.\r
+ *\r
+ * Revision 1.43  1995/06/19  13:06:08  adam\r
+ * New define: IR_TCL_VERSION.\r
+ *\r
+ * Revision 1.42  1995/06/19  08:08:52  adam\r
+ * client.tcl: hotTargets now contain both database and target name.\r
+ * ir-tcl.c: setting protocol edited. Errors in callbacks are logged\r
+ * by logf(LOG_WARN, ...) calls.\r
+ *\r
+ * Revision 1.41  1995/06/16  12:28:16  adam\r
+ * Implemented preferredRecordSyntax.\r
+ * Minor changes in diagnostic handling.\r
+ * Record list deleted when connection closes.\r
+ *\r
+ * Revision 1.40  1995/06/14  13:37:18  adam\r
+ * Setting recordType implemented.\r
+ * Setting implementationVersion implemented.\r
+ * Settings implementationId / implementationName edited.\r
+ *\r
+ * Revision 1.39  1995/06/08  10:26:32  adam\r
+ * Bug fix in ir_strdup.\r
+ *\r
+ * Revision 1.38  1995/06/01  16:36:47  adam\r
+ * About buttons. Minor bug fixes.\r
+ *\r
+ * Revision 1.37  1995/06/01  07:31:20  adam\r
+ * Rename of many typedefs -> IrTcl_...\r
+ *\r
+ * Revision 1.36  1995/05/31  13:09:59  adam\r
+ * Client searches/presents may be interrupted.\r
+ * New moving book-logo.\r
+ *\r
+ * Revision 1.35  1995/05/31  08:36:33  adam\r
+ * Bug fix in client.tcl: didn't save options on clientrc.tcl.\r
+ * New method: referenceId. More work on scan.\r
+ *\r
+ * Revision 1.34  1995/05/29  10:33:42  adam\r
+ * README and rename of startup script.\r
+ *\r
+ * Revision 1.33  1995/05/29  09:15:11  quinn\r
+ * Changed CS_SR to PROTO_SR, etc.\r
+ *\r
+ * Revision 1.32  1995/05/29  08:44:16  adam\r
+ * Work on delete of objects.\r
+ *\r
+ * Revision 1.31  1995/05/26  11:44:10  adam\r
+ * Bugs fixed. More work on MARC utilities and queries. Test\r
+ * client is up-to-date again.\r
+ *\r
+ * Revision 1.30  1995/05/26  08:54:11  adam\r
+ * New MARC utilities. Uses prefix query.\r
+ *\r
+ * Revision 1.29  1995/05/24  14:10:22  adam\r
+ * Work on idAuthentication, protocolVersion and options.\r
+ *\r
+ * Revision 1.28  1995/05/23  15:34:48  adam\r
+ * Many new settings, userInformationField, smallSetUpperBound, etc.\r
+ * A number of settings are inherited when ir-set is executed.\r
+ * This version is incompatible with the graphical test client (client.tcl).\r
+ *\r
+ * Revision 1.27  1995/05/11  15:34:47  adam\r
+ * Scan request changed a bit. This version works with RLG.\r
+ *\r
+ * Revision 1.26  1995/04/18  16:11:51  adam\r
+ * First version of graphical Scan. Some work on query-by-form.\r
+ *\r
+ * Revision 1.25  1995/04/17  09:37:17  adam\r
+ * Further development of scan.\r
+ *\r
+ * Revision 1.24  1995/04/11  14:16:42  adam\r
+ * Further work on scan. Response works. Entries aren't saved yet.\r
+ *\r
+ * Revision 1.23  1995/04/10  10:50:27  adam\r
+ * Result-set name defaults to suffix of ir-set name.\r
+ * Started working on scan. Not finished at this point.\r
+ *\r
+ * Revision 1.22  1995/03/31  10:43:03  adam\r
+ * More robust when getting bad MARC records.\r
+ *\r
+ * Revision 1.21  1995/03/31  08:56:37  adam\r
+ * New button "Search".\r
+ *\r
+ * Revision 1.20  1995/03/29  16:07:09  adam\r
+ * Bug fix: Didn't use setName in present request.\r
+ *\r
+ * Revision 1.19  1995/03/28  12:45:23  adam\r
+ * New ir method failback: called on disconnect/protocol error.\r
+ * New ir set/get method: protocol: SR / Z3950.\r
+ * Simple popup and disconnect when failback is invoked.\r
+ *\r
+ * Revision 1.18  1995/03/21  15:50:12  adam\r
+ * Minor changes.\r
+ *\r
+ * Revision 1.17  1995/03/21  13:41:03  adam\r
+ * Comstack cs_create not used too often. Non-blocking connect.\r
+ *\r
+ * Revision 1.16  1995/03/21  08:26:06  adam\r
+ * New method, setName, to specify the result set name (other than Default).\r
+ * New method, responseStatus, which returns diagnostic info, if any, after\r
+ * present response / search response.\r
+ *\r
+ * Revision 1.15  1995/03/20  15:24:07  adam\r
+ * Diagnostic records saved on searchResponse.\r
+ *\r
+ * Revision 1.14  1995/03/20  08:53:22  adam\r
+ * Event loop in tclmain.c rewritten. New method searchStatus.\r
+ *\r
+ * Revision 1.13  1995/03/17  18:26:17  adam\r
+ * Non-blocking i/o used now. Database names popup as cascade items.\r
+ *\r
+ * Revision 1.12  1995/03/17  15:45:00  adam\r
+ * Improved target/database setup.\r
+ *\r
+ * Revision 1.11  1995/03/16  17:54:03  adam\r
+ * Minor changes really.\r
+ *\r
+ * Revision 1.10  1995/03/15  16:14:50  adam\r
+ * Blocking arg in cs_create changed.\r
+ *\r
+ * Revision 1.9  1995/03/15  13:59:24  adam\r
+ * Minor changes.\r
+ *\r
+ * Revision 1.8  1995/03/15  08:25:16  adam\r
+ * New method presentStatus to check for error on present. Misc. cleanup\r
+ * of IrTcl_RecordList manipulations. Full MARC record presentation in\r
+ * search.tcl.\r
+ *\r
+ * Revision 1.7  1995/03/14  17:32:29  adam\r
+ * Presentation of full Marc record in popup window.\r
+ *\r
+ * Revision 1.6  1995/03/12  19:31:55  adam\r
+ * Pattern matching implemented when retrieving MARC records. More\r
+ * diagnostic functions.\r
+ *\r
+ * Revision 1.5  1995/03/10  18:00:15  adam\r
+ * Actual presentation in line-by-line format. RPN query support.\r
+ *\r
+ * Revision 1.4  1995/03/09  16:15:08  adam\r
+ * First presentRequest attempts. Hot-target list.\r
+ *\r
+ */\r
+\r
+#include <stdlib.h>\r
+#include <stdio.h>\r
+#ifdef WINDOWS\r
+#include <time.h>\r
+#else\r
+#include <sys/time.h>\r
+#endif\r
+#include <assert.h>\r
+\r
+#define CS_BLOCK 0\r
+\r
+#include "ir-tclp.h"\r
+\r
+typedef struct {\r
+    int type;\r
+    char *name;\r
+    int (*method) (void *obj, Tcl_Interp *interp, int argc, char **argv);\r
+} IrTcl_Method;\r
+\r
+typedef struct {\r
+    void *obj;\r
+    IrTcl_Method *tab;\r
+} IrTcl_Methods;\r
+\r
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);\r
+static int do_disconnect (void *obj, Tcl_Interp *interp, \r
+                          int argc, char **argv);\r
+\r
+static IrTcl_RecordList *new_IR_record (IrTcl_SetObj *setobj, \r
+                                        int no, int which, \r
+                                        const char *elements)\r
+{\r
+    IrTcl_RecordList *rl;\r
+\r
+    for (rl = setobj->record_list; rl; rl = rl->next)\r
+    {\r
+        if (no == rl->no && (!rl->elements || !elements ||\r
+                             !strcmp(elements, rl->elements)))\r
+        {\r
+            free (rl->elements);\r
+            switch (rl->which)\r
+            {\r
+            case Z_NamePlusRecord_databaseRecord:\r
+                free (rl->u.dbrec.buf);\r
+                rl->u.dbrec.buf = NULL;\r
+                break;\r
+            case Z_NamePlusRecord_surrogateDiagnostic:\r
+                ir_deleteDiags (&rl->u.surrogateDiagnostics.list,\r
+                                &rl->u.surrogateDiagnostics.num);\r
+                break;\r
+            }\r
+            break;\r
+        }\r
+    }\r
+    if (!rl)\r
+    {\r
+        rl = ir_tcl_malloc (sizeof(*rl));\r
+        rl->next = setobj->record_list;\r
+        rl->no = no;\r
+        setobj->record_list = rl;\r
+    }\r
+    rl->which = which;\r
+    ir_tcl_strdup (NULL, &rl->elements, elements);\r
+    return rl;\r
+}\r
+\r
+static struct {\r
+    enum oid_value value;\r
+    const char *name;\r
+} IrTcl_recordSyntaxTab[] = { \r
+{ VAL_UNIMARC,    "UNIMARC" },\r
+{ VAL_INTERMARC,  "INTERMARC" },\r
+{ VAL_CCF,        "CCF" },\r
+{ VAL_USMARC,     "USMARC" },\r
+{ VAL_UKMARC,     "UKMARC" },\r
+{ VAL_NORMARC,    "NORMARC" },\r
+{ VAL_LIBRISMARC, "LIBRISMARC" },\r
+{ VAL_DANMARC,    "DANMARC" },\r
+{ VAL_FINMARC,    "FINMARC" },\r
+{ VAL_MAB,        "MAB" },\r
+{ VAL_CANMARC,    "CANMARC" },\r
+{ VAL_SBN,        "SBN" },\r
+{ VAL_PICAMARC,   "PICAMARC" },\r
+{ VAL_AUSMARC,    "AUSMARC" },\r
+{ VAL_IBERMARC,   "IBERMARC" },\r
+{ VAL_SUTRS,      "SUTRS" },\r
+{ VAL_GRS1,       "GRS1" },\r
+{ 0, NULL }\r
+};\r
+\r
+/* \r
+ * IrTcl_eval\r
+ */\r
+int IrTcl_eval (Tcl_Interp *interp, const char *command)\r
+{\r
+    char *tmp = ir_tcl_malloc (strlen(command)+1);\r
+    int r;\r
+\r
+    strcpy (tmp, command);\r
+    r = Tcl_Eval (interp, tmp);\r
+    if (r == TCL_ERROR)\r
+        logf (LOG_WARN, "Tcl error in line %d: %s", interp->errorLine, \r
+              interp->result);\r
+    Tcl_FreeResult (interp);\r
+    free (tmp);\r
+    return r;\r
+}\r
+\r
+/*\r
+ * IrTcl_getRecordSyntaxStr: Return record syntax name of object id\r
+ */\r
+static const char *IrTcl_getRecordSyntaxStr (enum oid_value value)\r
+{\r
+    int i;\r
+    for (i = 0; IrTcl_recordSyntaxTab[i].name; i++) \r
+        if (IrTcl_recordSyntaxTab[i].value == value)\r
+            return IrTcl_recordSyntaxTab[i].name;\r
+    return "USMARC";\r
+}\r
+\r
+/*\r
+ * IrTcl_getRecordSyntaxVal: Return record syntax value of string\r
+ */\r
+static enum oid_value IrTcl_getRecordSyntaxVal (const char *name)\r
+{\r
+    int i;\r
+    for (i = 0; IrTcl_recordSyntaxTab[i].name; i++) \r
+        if (!strcmp (IrTcl_recordSyntaxTab[i].name, name))\r
+            return IrTcl_recordSyntaxTab[i].value;\r
+    return 0;\r
+}\r
+\r
+static IrTcl_RecordList *find_IR_record (IrTcl_SetObj *setobj, int no)\r
+{\r
+    IrTcl_RecordList *rl;\r
+\r
+    for (rl = setobj->record_list; rl; rl = rl->next)\r
+        if (no == rl->no && \r
+            (!setobj->recordElements || !rl->elements || \r
+             !strcmp (setobj->recordElements, rl->elements)))\r
+            return rl;\r
+    return NULL;\r
+}\r
+\r
+static void delete_IR_records (IrTcl_SetObj *setobj)\r
+{\r
+    IrTcl_RecordList *rl, *rl1;\r
+\r
+    for (rl = setobj->record_list; rl; rl = rl1)\r
+    {\r
+        switch (rl->which)\r
+        {\r
+        case Z_NamePlusRecord_databaseRecord:\r
+            free (rl->u.dbrec.buf);\r
+            break;\r
+        case Z_NamePlusRecord_surrogateDiagnostic:\r
+            ir_deleteDiags (&rl->u.surrogateDiagnostics.list,\r
+                            &rl->u.surrogateDiagnostics.num);\r
+            break;\r
+        }\r
+        rl1 = rl->next;\r
+        free (rl);\r
+    }\r
+    setobj->record_list = NULL;\r
+}\r
+\r
+/*\r
+ * get_set_int: Set/get integer value\r
+ */\r
+static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    char buf[20];\r
+    \r
+    if (argc == 3)\r
+    {\r
+        if (Tcl_GetInt (interp, argv[2], val)==TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    sprintf (buf, "%d", *val);\r
+    Tcl_AppendResult (interp, buf, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * ir_method: Search for method in table and invoke method handler\r
+ */\r
+int ir_method (Tcl_Interp *interp, int argc, char **argv, IrTcl_Methods *tab)\r
+{\r
+    IrTcl_Methods *tab_i = tab;\r
+    IrTcl_Method *t;\r
+\r
+    for (tab_i = tab; tab_i->tab; tab_i++)\r
+        for (t = tab_i->tab; t->name; t++)\r
+            if (argc <= 0)\r
+            {\r
+                if ((*t->method)(tab_i->obj, interp, argc, argv) == TCL_ERROR)\r
+                    return TCL_ERROR;\r
+            }\r
+            else\r
+                if (!strcmp (t->name, argv[1]))\r
+                    return (*t->method)(tab_i->obj, interp, argc, argv);\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    Tcl_AppendResult (interp, "Bad method: ", argv[1], \r
+                      ". Possible methods:", NULL);\r
+    for (tab_i = tab; tab_i->tab; tab_i++)\r
+        for (t = tab_i->tab; t->name; t++)\r
+            Tcl_AppendResult (interp, " ", t->name, NULL);\r
+    return TCL_ERROR;\r
+}\r
+\r
+/*\r
+ * ir_method_r: Get status for all readable elements\r
+ */\r
+int ir_method_r (void *obj, Tcl_Interp *interp, int argc, char **argv,\r
+                 IrTcl_Method *tab)\r
+{\r
+    char *argv_n[3];\r
+    int argc_n;\r
+\r
+    argv_n[0] = argv[0];\r
+    argc_n = 2;\r
+    for (; tab->name; tab++)\r
+        if (tab->type)\r
+        {\r
+            argv_n[1] = tab->name;\r
+            Tcl_AppendResult (interp, "{", NULL);\r
+            (*tab->method)(obj, interp, argc_n, argv_n);\r
+            Tcl_AppendResult (interp, "} ", NULL);\r
+        }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ *  ir_named_bits: get/set named bits\r
+ */\r
+int ir_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob,\r
+                   Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    struct ir_named_entry *ti;\r
+    if (argc > 0)\r
+    {\r
+        int no;\r
+        ODR_MASK_ZERO (ob);\r
+        for (no = 0; no < argc; no++)\r
+        {\r
+            for (ti = tab; ti->name; ti++)\r
+                if (!strcmp (argv[no], ti->name))\r
+                {\r
+                    ODR_MASK_SET (ob, ti->pos);\r
+                    break;\r
+                }\r
+            if (!ti->name)\r
+            {\r
+                Tcl_AppendResult (interp, "Bad bit mask: ", argv[no], NULL);\r
+                return TCL_ERROR;\r
+            }\r
+        }\r
+        return TCL_OK;\r
+    }\r
+    for (ti = tab; ti->name; ti++)\r
+        if (ODR_MASK_GET (ob, ti->pos))\r
+            Tcl_AppendElement (interp, ti->name);\r
+    return TCL_OK;\r
+}\r
+\r
+static void set_referenceId (ODR o, Z_ReferenceId **dst, const char *src)\r
+{\r
+    if (!src || !*src)\r
+        *dst = NULL;\r
+    else\r
+    {\r
+        *dst = odr_malloc (o, sizeof(**dst));\r
+        (*dst)->size = (*dst)->len = strlen(src);\r
+        (*dst)->buf = odr_malloc (o, (*dst)->len);\r
+        memcpy ((*dst)->buf, src, (*dst)->len);\r
+    }\r
+}\r
+\r
+static void get_referenceId (char **dst, Z_ReferenceId *src)\r
+{\r
+    free (*dst);\r
+    if (!src)\r
+    {\r
+        *dst = NULL;\r
+        return;\r
+    }\r
+    *dst = ir_tcl_malloc (src->len+1);\r
+    memcpy (*dst, src->buf, src->len);\r
+    (*dst)[src->len] = '\0';\r
+}\r
+\r
+/* ------------------------------------------------------- */\r
+\r
+/*\r
+ * do_init_request: init method on IR object\r
+ */\r
+static int do_init_request (void *obj, Tcl_Interp *interp,\r
+                            int argc, char **argv)\r
+{\r
+    Z_APDU *apdu;\r
+    IrTcl_Obj *p = obj;\r
+    Z_InitRequest *req;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (!p->cs_link)\r
+    {\r
+        interp->result = "init: not connected";\r
+        return TCL_ERROR;\r
+    }\r
+    apdu = zget_APDU (p->odr_out, Z_APDU_initRequest);\r
+    req = apdu->u.initRequest;\r
+\r
+    set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);\r
+    req->options = &p->options;\r
+    req->protocolVersion = &p->protocolVersion;\r
+    req->preferredMessageSize = &p->preferredMessageSize;\r
+    req->maximumRecordSize = &p->maximumRecordSize;\r
+\r
+    if (p->idAuthenticationGroupId)\r
+    {\r
+        Z_IdPass *pass = odr_malloc (p->odr_out, sizeof(*pass));\r
+        Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));\r
+\r
+        logf (LOG_DEBUG, "using pass authentication");\r
+\r
+        auth->which = Z_IdAuthentication_idPass;\r
+        auth->u.idPass = pass;\r
+        if (p->idAuthenticationGroupId && *p->idAuthenticationGroupId)\r
+            pass->groupId = p->idAuthenticationGroupId;\r
+        else\r
+            pass->groupId = NULL;\r
+        if (p->idAuthenticationUserId && *p->idAuthenticationUserId)\r
+            pass->userId = p->idAuthenticationUserId;\r
+        else\r
+            pass->userId = NULL;\r
+        if (p->idAuthenticationPassword && *p->idAuthenticationPassword)\r
+            pass->password = p->idAuthenticationPassword;\r
+        else\r
+            pass->password = NULL;\r
+        req->idAuthentication = auth;\r
+    }\r
+    else if (!p->idAuthenticationOpen || !*p->idAuthenticationOpen)\r
+        req->idAuthentication = NULL;\r
+    else\r
+    {\r
+        Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));\r
+\r
+        logf (LOG_DEBUG, "using open authentication");\r
+        auth->which = Z_IdAuthentication_open;\r
+        auth->u.open = p->idAuthenticationOpen;\r
+        req->idAuthentication = auth;\r
+    }\r
+    req->implementationId = p->implementationId;\r
+    req->implementationName = p->implementationName;\r
+    req->implementationVersion = p->implementationVersion;\r
+    req->userInformationField = 0;\r
+\r
+    return ir_tcl_send_APDU (interp, p, apdu, "init", argv[0]);\r
+}\r
+\r
+/*\r
+ * do_protocolVersion: Set protocol Version\r
+ */\r
+static int do_protocolVersion (void *obj, Tcl_Interp *interp,\r
+                               int argc, char **argv)\r
+{\r
+    int version, i;\r
+    char buf[10];\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        ODR_MASK_ZERO (&p->protocolVersion);\r
+        ODR_MASK_SET (&p->protocolVersion, 0);\r
+        ODR_MASK_SET (&p->protocolVersion, 1);\r
+        return TCL_OK;\r
+    }\r
+    if (argc == 3)\r
+    {\r
+        if (Tcl_GetInt (interp, argv[2], &version)==TCL_ERROR)\r
+            return TCL_ERROR;\r
+        ODR_MASK_ZERO (&p->protocolVersion);\r
+        for (i = 0; i<version; i++)\r
+            ODR_MASK_SET (&p->protocolVersion, i);\r
+    }\r
+    for (i = 4; --i >= 0; )\r
+        if (ODR_MASK_GET (&p->protocolVersion, i))\r
+            break;\r
+    sprintf (buf, "%d", i+1);\r
+    interp->result = buf;\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_options: Set options\r
+ */\r
+static int do_options (void *obj, Tcl_Interp *interp,\r
+                       int argc, char **argv)\r
+{\r
+    static struct ir_named_entry options_tab[] = {\r
+    { "search", 0 },\r
+    { "present", 1 },\r
+    { "delSet", 2 },\r
+    { "resourceReport", 3 },\r
+    { "triggerResourceCtrl", 4},\r
+    { "resourceCtrl", 5},\r
+    { "accessCtrl", 6},\r
+    { "scan", 7},\r
+    { "sort", 8},\r
+    { "extendedServices", 10},\r
+    { "level-1Segmentation", 11},\r
+    { "level-2Segmentation", 12},\r
+    { "concurrentOperations", 13},\r
+    { "namedResultSets", 14},\r
+    { NULL, 0}\r
+    };\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        ODR_MASK_ZERO (&p->options);\r
+        ODR_MASK_SET (&p->options, 0);\r
+        ODR_MASK_SET (&p->options, 1);\r
+        ODR_MASK_SET (&p->options, 4);\r
+        ODR_MASK_SET (&p->options, 7);\r
+        ODR_MASK_SET (&p->options, 14);\r
+        return TCL_OK;\r
+    }\r
+    return ir_named_bits (options_tab, &p->options, interp, argc-2, argv+2);\r
+}\r
+\r
+/*\r
+ * do_failInfo: Get fail information\r
+ */\r
+static int do_failInfo (void *obj, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    char buf[16], *cp;\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->failInfo = 0;\r
+        return TCL_OK;\r
+    }\r
+    sprintf (buf, "%d", p->failInfo);\r
+    switch (p->failInfo)\r
+    {\r
+    case 0:\r
+        cp = "ok";\r
+        break;\r
+    case IR_TCL_FAIL_CONNECT:\r
+        cp = "connect failed";\r
+        break;\r
+    case IR_TCL_FAIL_READ:\r
+        cp = "connection closed";\r
+        break;\r
+    case IR_TCL_FAIL_WRITE:\r
+        cp = "connection closed";\r
+        break;\r
+    case IR_TCL_FAIL_IN_APDU:\r
+        cp = "failed to decode incoming APDU";\r
+        break;\r
+    case IR_TCL_FAIL_UNKNOWN_APDU:\r
+        cp = "unknown APDU";\r
+        break;\r
+    default:\r
+        cp = "";\r
+    } \r
+    Tcl_AppendElement (interp, buf);\r
+    Tcl_AppendElement (interp, cp);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_preferredMessageSize: Set/get preferred message size\r
+ */\r
+static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,\r
+                                    int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->preferredMessageSize = 30000;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->preferredMessageSize, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_maximumRecordSize: Set/get maximum record size\r
+ */\r
+static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,\r
+                                 int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->maximumRecordSize = 30000;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->maximumRecordSize, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_initResult: Get init result\r
+ */\r
+static int do_initResult (void *obj, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+   \r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&p->initResult, interp, argc, argv);\r
+}\r
+\r
+\r
+/*\r
+ * do_implementationName: Set/get Implementation Name.\r
+ */\r
+static int do_implementationName (void *obj, Tcl_Interp *interp,\r
+                                    int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+        return ir_tcl_strdup (interp, &p->implementationName,\r
+                          "Index Data/IrTcl on YAZ");\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->implementationName);\r
+    if (argc == 3)\r
+    {\r
+        free (p->implementationName);\r
+        if (ir_tcl_strdup (interp, &p->implementationName, argv[2])\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendResult (interp, p->implementationName, (char*) NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_implementationId: Get Implementation Id.\r
+ */\r
+static int do_implementationId (void *obj, Tcl_Interp *interp,\r
+                                int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+        return ir_tcl_strdup (interp, &p->implementationId, "YAZ (id=81)");\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->implementationId);\r
+    Tcl_AppendResult (interp, p->implementationId, (char*) NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_implementationVersion: get Implementation Version.\r
+ */\r
+static int do_implementationVersion (void *obj, Tcl_Interp *interp,\r
+                                     int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+        return ir_tcl_strdup (interp, &p->implementationVersion, \r
+                          "YAZ: " YAZ_VERSION " / IrTcl: " IR_TCL_VERSION);\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->implementationVersion);\r
+    Tcl_AppendResult (interp, p->implementationVersion, (char*) NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_targetImplementationName: Get Implementation Name of target.\r
+ */\r
+static int do_targetImplementationName (void *obj, Tcl_Interp *interp,\r
+                                        int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+    \r
+    if (argc == 0)\r
+    {\r
+        p->targetImplementationName = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->targetImplementationName);\r
+    Tcl_AppendResult (interp, p->targetImplementationName, (char*) NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_targetImplementationId: Get Implementation Id of target\r
+ */\r
+static int do_targetImplementationId (void *obj, Tcl_Interp *interp,\r
+                                      int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->targetImplementationId = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->targetImplementationId);\r
+    Tcl_AppendResult (interp, p->targetImplementationId, (char*) NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_targetImplementationVersion: Get Implementation Version of target\r
+ */\r
+static int do_targetImplementationVersion (void *obj, Tcl_Interp *interp,\r
+                                           int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->targetImplementationVersion = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->targetImplementationVersion);\r
+    Tcl_AppendResult (interp, p->targetImplementationVersion, (char*) NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_idAuthentication: Set/get id Authentication\r
+ */\r
+static int do_idAuthentication (void *obj, Tcl_Interp *interp,\r
+                                int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc >= 3 || argc == -1)\r
+    {\r
+        free (p->idAuthenticationOpen);\r
+        free (p->idAuthenticationGroupId);\r
+        free (p->idAuthenticationUserId);\r
+        free (p->idAuthenticationPassword);\r
+    }\r
+    if (argc >= 3 || argc <= 0)\r
+    {\r
+        p->idAuthenticationOpen = NULL;\r
+        p->idAuthenticationGroupId = NULL;\r
+        p->idAuthenticationUserId = NULL;\r
+        p->idAuthenticationPassword = NULL;\r
+    }\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc >= 3)\r
+    {\r
+        if (argc == 3)\r
+        {\r
+            if (argv[2][0] && \r
+                ir_tcl_strdup (interp, &p->idAuthenticationOpen, argv[2])\r
+                == TCL_ERROR)\r
+                return TCL_ERROR;\r
+        }\r
+        else if (argc == 5)\r
+        {\r
+            if (argv[2][0] && \r
+                ir_tcl_strdup (interp, &p->idAuthenticationGroupId, argv[2])\r
+                == TCL_ERROR)\r
+                return TCL_ERROR;\r
+            if (argv[3][0] && \r
+                ir_tcl_strdup (interp, &p->idAuthenticationUserId, argv[3])\r
+                == TCL_ERROR)\r
+                return TCL_ERROR;\r
+            if (argv[4][0] &&\r
+                ir_tcl_strdup (interp, &p->idAuthenticationPassword, argv[4])\r
+                == TCL_ERROR)\r
+                return TCL_ERROR;\r
+        }\r
+    }\r
+    if (p->idAuthenticationOpen)\r
+        Tcl_AppendElement (interp, p->idAuthenticationOpen);\r
+    else if (p->idAuthenticationGroupId)\r
+    {\r
+        Tcl_AppendElement (interp, p->idAuthenticationGroupId);\r
+        Tcl_AppendElement (interp, p->idAuthenticationUserId);\r
+        Tcl_AppendElement (interp, p->idAuthenticationPassword);\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_connect: connect method on IR object\r
+ */\r
+static int do_connect (void *obj, Tcl_Interp *interp,\r
+                       int argc, char **argv)\r
+{\r
+    void *addr;\r
+    IrTcl_Obj *p = obj;\r
+    int r;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc == 3)\r
+    {\r
+        if (p->hostname)\r
+        {\r
+            interp->result = "already connected";\r
+            return TCL_ERROR;\r
+        }\r
+        if (ir_tcl_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+        if (!strcmp (p->cs_type, "tcpip"))\r
+        {\r
+            p->cs_link = cs_create (tcpip_type, CS_BLOCK, p->protocol_type);\r
+            addr = tcpip_strtoaddr (argv[2]);\r
+            if (!addr)\r
+            {\r
+                interp->result = "tcpip_strtoaddr fail";\r
+                return TCL_ERROR;\r
+            }\r
+            logf (LOG_DEBUG, "tcp/ip connect %s", argv[2]);\r
+        }\r
+        else if (!strcmp (p->cs_type, "mosi"))\r
+        {\r
+#if MOSI\r
+            p->cs_link = cs_create (mosi_type, CS_BLOCK, p->protocol_type);\r
+            addr = mosi_strtoaddr (argv[2]);\r
+            if (!addr)\r
+            {\r
+                interp->result = "mosi_strtoaddr fail";\r
+                return TCL_ERROR;\r
+            }\r
+            logf (LOG_DEBUG, "mosi connect %s", argv[2]);\r
+#else\r
+            interp->result = "MOSI support not there";\r
+            return TCL_ERROR;\r
+#endif\r
+        }\r
+        else \r
+        {\r
+            Tcl_AppendResult (interp, "Bad comstack type: ", \r
+                              p->cs_type, NULL);\r
+            return TCL_ERROR;\r
+        }\r
+        if ((r=cs_connect (p->cs_link, addr)) < 0)\r
+        {\r
+            interp->result = "connect fail";\r
+            do_disconnect (p, NULL, 2, NULL);\r
+            return TCL_ERROR;\r
+        }\r
+        ir_select_add (cs_fileno (p->cs_link), p);\r
+        if (r == 1)\r
+        {\r
+            ir_select_add_write (cs_fileno (p->cs_link), p);\r
+            p->state = IR_TCL_R_Connecting;\r
+        }\r
+        else\r
+        {\r
+            p->state = IR_TCL_R_Idle;\r
+            if (p->callback)\r
+                IrTcl_eval (p->interp, p->callback);\r
+        }\r
+    }\r
+    else\r
+        Tcl_AppendResult (interp, p->hostname, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_disconnect: disconnect method on IR object\r
+ */\r
+static int do_disconnect (void *obj, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->state = IR_TCL_R_Idle;\r
+        p->hostname = NULL;\r
+        p->cs_link = NULL;\r
+        return TCL_OK;\r
+    }\r
+    if (p->hostname)\r
+    {\r
+        free (p->hostname);\r
+        p->hostname = NULL;\r
+        ir_select_remove_write (cs_fileno (p->cs_link), p);\r
+        ir_select_remove (cs_fileno (p->cs_link), p);\r
+\r
+        odr_reset (p->odr_in);\r
+\r
+        assert (p->cs_link);\r
+        cs_close (p->cs_link);\r
+        p->cs_link = NULL;\r
+\r
+        ODR_MASK_ZERO (&p->options);\r
+        ODR_MASK_SET (&p->options, 0);\r
+        ODR_MASK_SET (&p->options, 1);\r
+        ODR_MASK_SET (&p->options, 4);\r
+        ODR_MASK_SET (&p->options, 7);\r
+        ODR_MASK_SET (&p->options, 14);\r
+\r
+        ODR_MASK_ZERO (&p->protocolVersion);\r
+        ODR_MASK_SET (&p->protocolVersion, 0);\r
+        ODR_MASK_SET (&p->protocolVersion, 1);\r
+        ir_tcl_del_q (p);\r
+    }\r
+    assert (!p->cs_link);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_comstack: Set/get comstack method on IR object\r
+ */\r
+static int do_comstack (void *o, Tcl_Interp *interp,\r
+                        int argc, char **argv)\r
+{\r
+    IrTcl_Obj *obj = o;\r
+\r
+    if (argc == 0)\r
+        return ir_tcl_strdup (interp, &obj->cs_type, "tcpip");\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &obj->cs_type);\r
+    else if (argc == 3)\r
+    {\r
+        free (obj->cs_type);\r
+        if (ir_tcl_strdup (interp, &obj->cs_type, argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendElement (interp, obj->cs_type);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_logLevel: Set log level\r
+ */\r
+static int do_logLevel (void *o, Tcl_Interp *interp,\r
+                        int argc, char **argv)\r
+{\r
+    if (argc <= 2)\r
+        return TCL_OK;\r
+    if (argc == 3)\r
+        log_init (log_mask_str (argv[2]), "", NULL);\r
+    else if (argc == 4)\r
+        log_init (log_mask_str (argv[2]), argv[3], NULL);\r
+    else if (argc == 5)\r
+        log_init (log_mask_str (argv[2]), argv[3], argv[4]);\r
+    return TCL_OK;\r
+}\r
+\r
+\r
+/*\r
+ * do_callback: add callback\r
+ */\r
+static int do_callback (void *obj, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->callback = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->callback);\r
+    if (argc == 3)\r
+    {\r
+        free (p->callback);\r
+        if (argv[2][0])\r
+        {\r
+            if (ir_tcl_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)\r
+                return TCL_ERROR;\r
+        }\r
+        else\r
+            p->callback = NULL;\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_failback: add error handle callback\r
+ */\r
+static int do_failback (void *obj, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->failback = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->failback);\r
+    else if (argc == 3)\r
+    {\r
+        free (p->failback);\r
+        if (argv[2][0])\r
+        {\r
+            if (ir_tcl_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)\r
+                return TCL_ERROR;\r
+        }\r
+        else\r
+            p->failback = NULL;\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_protocol: Set/get protocol method on IR object\r
+ */\r
+static int do_protocol (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = o;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->protocol_type = PROTO_Z3950;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == 3)\r
+    {\r
+        if (!strcmp (argv[2], "Z39"))\r
+            p->protocol_type = PROTO_Z3950;\r
+        else if (!strcmp (argv[2], "SR"))\r
+            p->protocol_type = PROTO_SR;\r
+        else\r
+        {\r
+            Tcl_AppendResult (interp, "Bad protocol: ", argv[2], NULL);\r
+            return TCL_ERROR;\r
+        }\r
+        return TCL_OK;\r
+    }\r
+    switch (p->protocol_type)\r
+    {\r
+    case PROTO_Z3950:\r
+        Tcl_AppendElement (interp, "Z39");\r
+        break;\r
+    case PROTO_SR:\r
+        Tcl_AppendElement (interp, "SR");\r
+        break;\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_triggerResourceControl:\r
+ */\r
+static int do_triggerResourceControl (void *obj, Tcl_Interp *interp,\r
+                                      int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+    Z_APDU *apdu;\r
+    Z_TriggerResourceControlRequest *req;\r
+    bool_t is_false = 0;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (!p->cs_link)\r
+    {\r
+        interp->result = "triggerResourceControl: not connected";\r
+        return TCL_ERROR;\r
+    }\r
+    apdu = zget_APDU (p->odr_out, Z_APDU_triggerResourceControlRequest);\r
+    req = apdu->u.triggerResourceControlRequest;\r
+    *req->requestedAction = Z_TriggerResourceCtrl_cancel;\r
+    req->resultSetWanted = &is_false; \r
+    \r
+    return ir_tcl_send_APDU (interp, p, apdu, "triggerResourceControl",\r
+                             argv[0]);\r
+}\r
+\r
+/*\r
+ * do_databaseNames: specify database names\r
+ */\r
+static int do_databaseNames (void *obj, Tcl_Interp *interp,\r
+                             int argc, char **argv)\r
+{\r
+    int i;\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == -1)\r
+    {\r
+        for (i=0; i<p->num_databaseNames; i++)\r
+            free (p->databaseNames[i]);\r
+        free (p->databaseNames);\r
+    }\r
+    if (argc <= 0)\r
+    {\r
+        p->num_databaseNames = 0;\r
+        p->databaseNames = NULL;\r
+        return TCL_OK;\r
+    }\r
+    if (argc < 3)\r
+    {\r
+        for (i=0; i<p->num_databaseNames; i++)\r
+            Tcl_AppendElement (interp, p->databaseNames[i]);\r
+        return TCL_OK;\r
+    }\r
+    if (p->databaseNames)\r
+    {\r
+        for (i=0; i<p->num_databaseNames; i++)\r
+            free (p->databaseNames[i]);\r
+        free (p->databaseNames);\r
+    }\r
+    p->num_databaseNames = argc - 2;\r
+    p->databaseNames =\r
+        ir_tcl_malloc (sizeof(*p->databaseNames) * p->num_databaseNames);\r
+    for (i=0; i<p->num_databaseNames; i++)\r
+    {\r
+        if (ir_tcl_strdup (interp, &p->databaseNames[i], argv[2+i]) \r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_replaceIndicator: Set/get replace Set indicator\r
+ */\r
+static int do_replaceIndicator (void *obj, Tcl_Interp *interp,\r
+                                int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->replaceIndicator = 1;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->replaceIndicator, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_queryType: Set/Get query method\r
+ */\r
+static int do_queryType (void *obj, Tcl_Interp *interp,\r
+                       int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == 0)\r
+        return ir_tcl_strdup (interp, &p->queryType, "rpn");\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->queryType);\r
+    if (argc == 3)\r
+    {\r
+        free (p->queryType);\r
+        if (ir_tcl_strdup (interp, &p->queryType, argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendResult (interp, p->queryType, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_userInformationField: Get User information field\r
+ */\r
+static int do_userInformationField (void *obj, Tcl_Interp *interp,\r
+                                    int argc, char **argv)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+    \r
+    if (argc == 0)\r
+    {\r
+        p->userInformationField = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->userInformationField);\r
+    Tcl_AppendResult (interp, p->userInformationField, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_smallSetUpperBound: Set/get small set upper bound\r
+ */\r
+static int do_smallSetUpperBound (void *o, Tcl_Interp *interp,\r
+                       int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = o;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->smallSetUpperBound = 0;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->smallSetUpperBound, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_largeSetLowerBound: Set/get large set lower bound\r
+ */\r
+static int do_largeSetLowerBound (void *o, Tcl_Interp *interp,\r
+                                  int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = o;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->largeSetLowerBound = 2;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->largeSetLowerBound, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_mediumSetPresentNumber: Set/get large set lower bound\r
+ */\r
+static int do_mediumSetPresentNumber (void *o, Tcl_Interp *interp,\r
+                                      int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = o;\r
+   \r
+    if (argc <= 0)\r
+    {\r
+        p->mediumSetPresentNumber = 0;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->mediumSetPresentNumber, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_referenceId: Set/Get referenceId\r
+ */\r
+static int do_referenceId (void *obj, Tcl_Interp *interp,\r
+                           int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->referenceId = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->referenceId);\r
+    if (argc == 3)\r
+    {\r
+        free (p->referenceId);\r
+        if (ir_tcl_strdup (interp, &p->referenceId, argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendResult (interp, p->referenceId, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_preferredRecordSyntax: Set/get preferred record syntax\r
+ */\r
+static int do_preferredRecordSyntax (void *obj, Tcl_Interp *interp,\r
+                                     int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->preferredRecordSyntax = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+    {\r
+        free (p->preferredRecordSyntax);\r
+        p->preferredRecordSyntax = NULL;\r
+        return TCL_OK;\r
+    }\r
+    if (argc == 3)\r
+    {\r
+        free (p->preferredRecordSyntax);\r
+        p->preferredRecordSyntax = NULL;\r
+        if (argv[2][0] && (p->preferredRecordSyntax = \r
+                           ir_tcl_malloc (sizeof(*p->preferredRecordSyntax))))\r
+            *p->preferredRecordSyntax = IrTcl_getRecordSyntaxVal (argv[2]);\r
+    }\r
+    return TCL_OK;\r
+            \r
+}\r
+\r
+/*\r
+ * do_elementSetNames: Set/Get element Set Names\r
+ */\r
+static int do_elementSetNames (void *obj, Tcl_Interp *interp,\r
+                               int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->elementSetNames = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->elementSetNames);\r
+    if (argc == 3)\r
+    {\r
+        free (p->elementSetNames);\r
+        if (ir_tcl_strdup (interp, &p->elementSetNames, argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendResult (interp, p->elementSetNames, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_smallSetElementSetNames: Set/Get small Set Element Set Names\r
+ */\r
+static int do_smallSetElementSetNames (void *obj, Tcl_Interp *interp,\r
+                               int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->smallSetElementSetNames = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->smallSetElementSetNames);\r
+    if (argc == 3)\r
+    {\r
+        free (p->smallSetElementSetNames);\r
+        if (ir_tcl_strdup (interp, &p->smallSetElementSetNames,\r
+                           argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendResult (interp, p->smallSetElementSetNames, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_mediumSetElementSetNames: Set/Get medium Set Element Set Names\r
+ */\r
+static int do_mediumSetElementSetNames (void *obj, Tcl_Interp *interp,\r
+                               int argc, char **argv)\r
+{\r
+    IrTcl_SetCObj *p = obj;\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->mediumSetElementSetNames = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &p->mediumSetElementSetNames);\r
+    if (argc == 3)\r
+    {\r
+        free (p->mediumSetElementSetNames);\r
+        if (ir_tcl_strdup (interp, &p->mediumSetElementSetNames,\r
+                           argv[2]) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendResult (interp, p->mediumSetElementSetNames, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+\r
+static IrTcl_Method ir_method_tab[] = {\r
+{ 1, "comstack",                    do_comstack },\r
+{ 1, "protocol",                    do_protocol },\r
+{ 0, "failback",                    do_failback },\r
+{ 0, "failInfo",                    do_failInfo },\r
+{ 0, "logLevel",                    do_logLevel },\r
+\r
+{ 1, "connect",                     do_connect },\r
+{ 0, "protocolVersion",             do_protocolVersion },\r
+{ 1, "preferredMessageSize",        do_preferredMessageSize },\r
+{ 1, "maximumRecordSize",           do_maximumRecordSize },\r
+{ 1, "implementationName",          do_implementationName },\r
+{ 1, "implementationId",            do_implementationId },\r
+{ 1, "implementationVersion",       do_implementationVersion },\r
+{ 0, "targetImplementationName",    do_targetImplementationName },\r
+{ 0, "targetImplementationId",      do_targetImplementationId },\r
+{ 0, "targetImplementationVersion", do_targetImplementationVersion },\r
+{ 0, "userInformationField",        do_userInformationField },\r
+{ 1, "idAuthentication",            do_idAuthentication },\r
+{ 0, "options",                     do_options },\r
+{ 0, "init",                        do_init_request },\r
+{ 0, "initResult",                  do_initResult },\r
+{ 0, "disconnect",                  do_disconnect },\r
+{ 0, "callback",                    do_callback },\r
+{ 0, "triggerResourceControl",      do_triggerResourceControl },\r
+{ 0, NULL, NULL}\r
+};\r
+\r
+static IrTcl_Method ir_set_c_method_tab[] = {\r
+{ 0, "databaseNames",               do_databaseNames},\r
+{ 0, "replaceIndicator",            do_replaceIndicator},\r
+{ 0, "queryType",                   do_queryType },\r
+{ 0, "preferredRecordSyntax",       do_preferredRecordSyntax },\r
+{ 0, "smallSetUpperBound",          do_smallSetUpperBound},\r
+{ 0, "largeSetLowerBound",          do_largeSetLowerBound},\r
+{ 0, "mediumSetPresentNumber",      do_mediumSetPresentNumber},\r
+{ 0, "referenceId",                 do_referenceId },\r
+{ 0, "elementSetNames",             do_elementSetNames },\r
+{ 0, "smallSetElementSetNames",     do_smallSetElementSetNames },\r
+{ 0, "mediumSetElementSetNames",    do_mediumSetElementSetNames },\r
+{ 0, NULL, NULL}\r
+};\r
+\r
+/* \r
+ * ir_obj_method: IR Object methods\r
+ */\r
+static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Methods tab[3];\r
+    IrTcl_Obj *p = clientData;\r
+\r
+    if (argc < 2)\r
+        return ir_method_r (clientData, interp, argc, argv, ir_method_tab);\r
+\r
+    tab[0].tab = ir_method_tab;\r
+    tab[0].obj = p;\r
+    tab[1].tab = ir_set_c_method_tab;\r
+    tab[1].obj = &p->set_inher;\r
+    tab[2].tab = NULL;\r
+\r
+    return ir_method (interp, argc, argv, tab);\r
+}\r
+\r
+/* \r
+ * ir_obj_delete: IR Object disposal\r
+ */\r
+static void ir_obj_delete (ClientData clientData)\r
+{\r
+    IrTcl_Obj *obj = clientData;\r
+    IrTcl_Methods tab[3];\r
+\r
+    --(obj->ref_count);\r
+    if (obj->ref_count > 0)\r
+        return;\r
+    assert (obj->ref_count == 0);\r
+\r
+    logf (LOG_DEBUG, "ir object delete");\r
+    tab[0].tab = ir_method_tab;\r
+    tab[0].obj = obj;\r
+    tab[1].tab = ir_set_c_method_tab;\r
+    tab[1].obj = &obj->set_inher;\r
+    tab[2].tab = NULL;\r
+\r
+    ir_method (NULL, -1, NULL, tab);\r
+\r
+    ir_tcl_del_q (obj);\r
+    odr_destroy (obj->odr_in);\r
+    odr_destroy (obj->odr_out);\r
+    odr_destroy (obj->odr_pr);\r
+    free (obj);\r
+}\r
+\r
+/* \r
+ * ir_obj_mk: IR Object creation\r
+ */\r
+static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,\r
+                      int argc, char **argv)\r
+{\r
+    IrTcl_Methods tab[3];\r
+    IrTcl_Obj *obj;\r
+#if CCL2RPN\r
+    FILE *inf;\r
+#endif\r
+\r
+    if (argc != 2)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    obj = ir_tcl_malloc (sizeof(*obj));\r
+    obj->ref_count = 1;\r
+#if CCL2RPN\r
+    obj->bibset = ccl_qual_mk (); \r
+    if ((inf = fopen ("default.bib", "r")))\r
+    {\r
+        ccl_qual_file (obj->bibset, inf);\r
+        fclose (inf);\r
+    }\r
+#endif\r
+\r
+    logf (LOG_DEBUG, "ir object create");\r
+    obj->odr_in = odr_createmem (ODR_DECODE);\r
+    obj->odr_out = odr_createmem (ODR_ENCODE);\r
+    obj->odr_pr = odr_createmem (ODR_PRINT);\r
+    obj->state = IR_TCL_R_Idle;\r
+    obj->interp = interp;\r
+\r
+    obj->len_in = 0;\r
+    obj->buf_in = NULL;\r
+    obj->request_queue = NULL;\r
+\r
+    tab[0].tab = ir_method_tab;\r
+    tab[0].obj = obj;\r
+    tab[1].tab = ir_set_c_method_tab;\r
+    tab[1].obj = &obj->set_inher;\r
+    tab[2].tab = NULL;\r
+\r
+    if (ir_method (interp, 0, NULL, tab) == TCL_ERROR)\r
+        return TCL_ERROR;\r
+    Tcl_CreateCommand (interp, argv[1], ir_obj_method,\r
+                       (ClientData) obj, ir_obj_delete);\r
+    return TCL_OK;\r
+}\r
+\r
+/* ------------------------------------------------------- */\r
+/*\r
+ * do_search: Do search request\r
+ */\r
+static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    Z_SearchRequest *req;\r
+    Z_Query query;\r
+    Z_APDU *apdu;\r
+    Odr_oct ccl_query;\r
+    IrTcl_SetObj *obj = o;\r
+    IrTcl_Obj *p;\r
+    int r;\r
+    oident bib1;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+\r
+    p = obj->parent;\r
+    if (argc != 3)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    if (!obj->set_inher.num_databaseNames)\r
+    {\r
+        interp->result = "no databaseNames";\r
+        return TCL_ERROR;\r
+    }\r
+    if (!p->cs_link)\r
+    {\r
+        interp->result = "search: not connected";\r
+        return TCL_ERROR;\r
+    }\r
+    apdu = zget_APDU (p->odr_out, Z_APDU_searchRequest);\r
+    req = apdu->u.searchRequest;\r
+\r
+    obj->start = 1;\r
+\r
+    bib1.proto = p->protocol_type;\r
+    bib1.class = CLASS_ATTSET;\r
+    bib1.value = VAL_BIB1;\r
+\r
+    set_referenceId (p->odr_out, &req->referenceId,\r
+                     obj->set_inher.referenceId);\r
+\r
+    req->smallSetUpperBound = &obj->set_inher.smallSetUpperBound;\r
+    req->largeSetLowerBound = &obj->set_inher.largeSetLowerBound;\r
+    req->mediumSetPresentNumber = &obj->set_inher.mediumSetPresentNumber;\r
+    req->replaceIndicator = &obj->set_inher.replaceIndicator;\r
+    req->resultSetName = obj->setName ? obj->setName : "Default";\r
+    logf (LOG_DEBUG, "Search, resultSetName %s", req->resultSetName);\r
+    req->num_databaseNames = obj->set_inher.num_databaseNames;\r
+    req->databaseNames = obj->set_inher.databaseNames;\r
+    for (r=0; r < obj->set_inher.num_databaseNames; r++)\r
+        logf (LOG_DEBUG, " Database %s", obj->set_inher.databaseNames[r]);\r
+    if (obj->set_inher.preferredRecordSyntax)\r
+    {\r
+        struct oident ident;\r
+\r
+        ident.proto = p->protocol_type;\r
+        ident.class = CLASS_RECSYN;\r
+        ident.value = *obj->set_inher.preferredRecordSyntax;\r
+        logf (LOG_DEBUG, "Preferred record syntax is %d", ident.value);\r
+        req->preferredRecordSyntax = odr_oiddup (p->odr_out, \r
+                                                 oid_getoidbyent (&ident));\r
+    }\r
+    else\r
+        req->preferredRecordSyntax = 0;\r
+\r
+    if (obj->set_inher.smallSetElementSetNames &&\r
+        *obj->set_inher.smallSetElementSetNames)\r
+    {\r
+        Z_ElementSetNames *esn = odr_malloc (p->odr_out, sizeof(*esn));\r
+        \r
+        esn->which = Z_ElementSetNames_generic;\r
+        esn->u.generic = obj->set_inher.smallSetElementSetNames;\r
+        req->smallSetElementSetNames = esn;\r
+    }\r
+    else\r
+        req->smallSetElementSetNames = NULL; \r
+    \r
+    if (obj->set_inher.mediumSetElementSetNames &&\r
+        *obj->set_inher.mediumSetElementSetNames)\r
+    {\r
+        Z_ElementSetNames *esn = odr_malloc (p->odr_out, sizeof(*esn));\r
+        \r
+        esn->which = Z_ElementSetNames_generic;\r
+        esn->u.generic = obj->set_inher.mediumSetElementSetNames;\r
+        req->mediumSetElementSetNames = esn;\r
+    }\r
+    else\r
+        req->mediumSetElementSetNames = NULL; \r
+    \r
+    req->query = &query;\r
+    \r
+    if (!strcmp (obj->set_inher.queryType, "rpn"))\r
+    {\r
+        Z_RPNQuery *RPNquery;\r
+\r
+        RPNquery = p_query_rpn (p->odr_out, argv[2]);\r
+        if (!RPNquery)\r
+        {\r
+            Tcl_AppendResult (interp, "Syntax error in query", NULL);\r
+            return TCL_ERROR;\r
+        }\r
+        RPNquery->attributeSetId = oid_getoidbyent (&bib1);\r
+        query.which = Z_Query_type_1;\r
+        query.u.type_1 = RPNquery;\r
+        logf (LOG_DEBUG, "RPN");\r
+    }\r
+#if CCL2RPN\r
+    else if (!strcmp (obj->set_inher.queryType, "cclrpn"))\r
+    {\r
+        int error;\r
+        int pos;\r
+        struct ccl_rpn_node *rpn;\r
+        Z_RPNQuery *RPNquery;\r
+\r
+        rpn = ccl_find_str(p->bibset, argv[2], &error, &pos);\r
+        if (error)\r
+        {\r
+            Tcl_AppendResult (interp, "CCL error: ", \r
+                              ccl_err_msg(error), NULL);\r
+            return TCL_ERROR;\r
+        }\r
+        ccl_pr_tree (rpn, stderr);\r
+        fprintf (stderr, "\n");\r
+        assert((RPNquery = ccl_rpn_query(rpn)));\r
+        RPNquery->attributeSetId = oid_getoidbyent (&bib1);\r
+        query.which = Z_Query_type_1;\r
+        query.u.type_1 = RPNquery;\r
+        logf (LOG_DEBUG, "CCLRPN");\r
+    }\r
+#endif\r
+    else if (!strcmp (obj->set_inher.queryType, "ccl"))\r
+    {\r
+        query.which = Z_Query_type_2;\r
+        query.u.type_2 = &ccl_query;\r
+        ccl_query.buf = (unsigned char *) argv[2];\r
+        ccl_query.len = strlen (argv[2]);\r
+        logf (LOG_DEBUG, "CCL");\r
+    }\r
+    else\r
+    {\r
+        interp->result = "unknown query method";\r
+        return TCL_ERROR;\r
+    }\r
+    return ir_tcl_send_APDU (interp, p, apdu, "search", argv[0]);\r
+}\r
+\r
+/*\r
+ * do_resultCount: Get number of hits\r
+ */\r
+static int do_resultCount (void *o, Tcl_Interp *interp,\r
+                       int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&obj->resultCount, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_searchStatus: Get search status (after search response)\r
+ */\r
+static int do_searchStatus (void *o, Tcl_Interp *interp,\r
+                            int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&obj->searchStatus, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_presentStatus: Get search status (after search/present response)\r
+ */\r
+static int do_presentStatus (void *o, Tcl_Interp *interp,\r
+                            int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&obj->presentStatus, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_nextResultSetPosition: Get next result set position\r
+ *       (after search/present response)\r
+ */\r
+static int do_nextResultSetPosition (void *o, Tcl_Interp *interp,\r
+                                     int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        obj->nextResultSetPosition = 0;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_setName: Set result Set name\r
+ */\r
+static int do_setName (void *o, Tcl_Interp *interp,\r
+                       int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc == 0)\r
+        return ir_tcl_strdup (interp, &obj->setName, "Default");\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (interp, &obj->setName);\r
+    if (argc == 3)\r
+    {\r
+        free (obj->setName);\r
+        if (ir_tcl_strdup (interp, &obj->setName, argv[2])\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    Tcl_AppendElement (interp, obj->setName);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_numberOfRecordsReturned: Get number of records returned\r
+ */\r
+static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,\r
+                                       int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        obj->numberOfRecordsReturned = 0;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_type: Return type (if any) at position.\r
+ */\r
+static int do_type (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    if (argc == 0)\r
+    {\r
+        obj->record_list = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+    {\r
+        delete_IR_records (obj);\r
+        return TCL_OK;\r
+    }\r
+    if (argc != 3)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)\r
+        return TCL_ERROR;\r
+    rl = find_IR_record (obj, offset);\r
+    if (!rl)\r
+    {\r
+        logf (LOG_DEBUG, "No record at position %d", offset);\r
+        return TCL_OK;\r
+    }\r
+    switch (rl->which)\r
+    {\r
+    case Z_NamePlusRecord_databaseRecord:\r
+        interp->result = "DB";\r
+        break;\r
+    case Z_NamePlusRecord_surrogateDiagnostic:\r
+        interp->result = "SD";\r
+        break;\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+\r
+/*\r
+ * do_recordType: Return record type (if any) at position.\r
+ */\r
+static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    if (argc == 0)\r
+    {\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+    {\r
+        return TCL_OK;\r
+    }\r
+    if (argc != 3)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)\r
+        return TCL_ERROR;\r
+    rl = find_IR_record (obj, offset);\r
+    if (!rl)\r
+        return TCL_OK;\r
+    if (rl->which != Z_NamePlusRecord_databaseRecord)\r
+    {\r
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    Tcl_AppendElement (interp, (char*)\r
+                       IrTcl_getRecordSyntaxStr (rl->u.dbrec.type));\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * set record elements (for record extraction)\r
+ */\r
+static int do_recordElements (void *o, Tcl_Interp *interp,\r
+                              int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc == 0)\r
+    {\r
+        obj->recordElements = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+        return ir_tcl_strdel (NULL, &obj->recordElements);\r
+    if (argc > 3)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (argc == 3)\r
+    {\r
+        free (obj->recordElements);\r
+        return ir_tcl_strdup (NULL, &obj->recordElements, \r
+                              (*argv[2] ? argv[2] : NULL));\r
+    }\r
+    Tcl_AppendResult (interp, obj->recordElements, NULL);\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * ir_diagResult \r
+ */\r
+static int ir_diagResult (Tcl_Interp *interp, IrTcl_Diagnostic *list, int num)\r
+{\r
+    char buf[20];\r
+    int i;\r
+    const char *cp;\r
+\r
+    for (i = 0; i<num; i++)\r
+    {\r
+        logf (LOG_DEBUG, "Diagnostic, code %d", list[i].condition);\r
+        sprintf (buf, "%d", list[i].condition);\r
+        Tcl_AppendElement (interp, buf);\r
+        cp = diagbib1_str (list[i].condition);\r
+        if (cp)\r
+            Tcl_AppendElement (interp, (char*) cp);\r
+        else\r
+            Tcl_AppendElement (interp, "");\r
+        if (list[i].addinfo)\r
+            Tcl_AppendElement (interp, (char*) list[i].addinfo);\r
+        else\r
+            Tcl_AppendElement (interp, "");\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_diag: Return diagnostic record info\r
+ */\r
+static int do_diag (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc != 3)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)\r
+        return TCL_ERROR;\r
+    rl = find_IR_record (obj, offset);\r
+    if (!rl)\r
+    {\r
+        Tcl_AppendResult (interp, "No record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    if (rl->which != Z_NamePlusRecord_surrogateDiagnostic)\r
+    {\r
+        Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    return ir_diagResult (interp, rl->u.surrogateDiagnostics.list,\r
+                          rl->u.surrogateDiagnostics.num);\r
+}\r
+\r
+/*\r
+ * do_getMarc: Get ISO2709 Record lines/fields\r
+ */\r
+static int do_getMarc (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc < 7)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)\r
+        return TCL_ERROR;\r
+    rl = find_IR_record (obj, offset);\r
+    if (!rl)\r
+    {\r
+        Tcl_AppendResult (interp, "No record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    if (rl->which != Z_NamePlusRecord_databaseRecord)\r
+    {\r
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    return ir_tcl_get_marc (interp, rl->u.dbrec.buf, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_getSutrs: Get SUTRS Record\r
+ */\r
+static int do_getSutrs (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc != 3)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)\r
+        return TCL_ERROR;\r
+    rl = find_IR_record (obj, offset);\r
+    if (!rl)\r
+    {\r
+        Tcl_AppendResult (interp, "No record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    if (rl->which != Z_NamePlusRecord_databaseRecord)\r
+    {\r
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    if (rl->u.dbrec.type != VAL_SUTRS)\r
+        return TCL_OK;\r
+    Tcl_AppendElement (interp, rl->u.dbrec.buf);\r
+    return TCL_OK;\r
+}\r
+\r
+\r
+/*\r
+ * do_getGrs: Get a GRS1 Record\r
+ */\r
+static int do_getGrs (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc < 3)\r
+    {\r
+        sprintf (interp->result, "wrong # args");\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)\r
+        return TCL_ERROR;\r
+    rl = find_IR_record (obj, offset);\r
+    if (!rl)\r
+    {\r
+        Tcl_AppendResult (interp, "No record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    if (rl->which != Z_NamePlusRecord_databaseRecord)\r
+    {\r
+        Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    if (rl->u.dbrec.type != VAL_GRS1)\r
+        return TCL_OK;\r
+    return ir_tcl_get_grs (interp, rl->u.dbrec.u.grs1, argc, argv);\r
+}\r
+\r
+\r
+/*\r
+ * do_responseStatus: Return response status (present or search)\r
+ */\r
+static int do_responseStatus (void *o, Tcl_Interp *interp, \r
+                             int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+\r
+    if (argc == 0)\r
+    {\r
+        obj->recordFlag = 0;\r
+        obj->nonSurrogateDiagnosticNum = 0;\r
+        obj->nonSurrogateDiagnosticList = NULL;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+    {\r
+        ir_deleteDiags (&obj->nonSurrogateDiagnosticList,\r
+                        &obj->nonSurrogateDiagnosticNum);\r
+        return TCL_OK;\r
+    }\r
+    if (!obj->recordFlag)\r
+    {\r
+        Tcl_AppendElement (interp, "OK");\r
+        return TCL_OK;\r
+    }\r
+    switch (obj->which)\r
+    {\r
+    case Z_Records_DBOSD:\r
+        Tcl_AppendElement (interp, "DBOSD");\r
+        break;\r
+    case Z_Records_NSD:\r
+        Tcl_AppendElement (interp, "NSD");\r
+        return ir_diagResult (interp, obj->nonSurrogateDiagnosticList,\r
+                              obj->nonSurrogateDiagnosticNum);\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+/*\r
+ * do_present: Perform Present Request\r
+ */\r
+\r
+static int do_present (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *obj = o;\r
+    IrTcl_Obj *p;\r
+    Z_APDU *apdu;\r
+    Z_PresentRequest *req;\r
+    int start;\r
+    int number;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc >= 3)\r
+    {\r
+        if (Tcl_GetInt (interp, argv[2], &start) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    else\r
+        start = 1;\r
+    if (argc >= 4)\r
+    {\r
+        if (Tcl_GetInt (interp, argv[3], &number) == TCL_ERROR)\r
+            return TCL_ERROR;\r
+    }\r
+    else \r
+        number = 10;\r
+    p = obj->parent;\r
+    if (!p->cs_link)\r
+    {\r
+        interp->result = "present: not connected";\r
+        return TCL_ERROR;\r
+    }\r
+\r
+    obj->start = start;\r
+    obj->number = number;\r
+\r
+    apdu = zget_APDU (p->odr_out, Z_APDU_presentRequest);\r
+    req = apdu->u.presentRequest;\r
+\r
+    set_referenceId (p->odr_out, &req->referenceId,\r
+                     obj->set_inher.referenceId);\r
+\r
+    req->resultSetId = obj->setName ? obj->setName : "Default";\r
+    \r
+    req->resultSetStartPoint = &start;\r
+    req->numberOfRecordsRequested = &number;\r
+    if (obj->set_inher.preferredRecordSyntax)\r
+    {\r
+        struct oident ident;\r
+\r
+        ident.proto = p->protocol_type;\r
+        ident.class = CLASS_RECSYN;\r
+        ident.value = *obj->set_inher.preferredRecordSyntax;\r
+        logf (LOG_DEBUG, "Preferred record syntax is %d", ident.value);\r
+        req->preferredRecordSyntax = odr_oiddup (p->odr_out, \r
+                                                 oid_getoidbyent (&ident));\r
+    }\r
+    else\r
+        req->preferredRecordSyntax = 0;\r
+\r
+    if (obj->set_inher.elementSetNames && *obj->set_inher.elementSetNames)\r
+    {\r
+        Z_ElementSetNames *esn = odr_malloc (p->odr_out, sizeof(*esn));\r
+        Z_RecordComposition *compo = odr_malloc (p->odr_out, sizeof(*compo));\r
+\r
+        esn->which = Z_ElementSetNames_generic;\r
+        esn->u.generic = obj->set_inher.elementSetNames;\r
+\r
+        req->recordComposition = compo;\r
+        compo->which = Z_RecordComp_simple;\r
+        compo->u.simple = esn;\r
+    }\r
+    else\r
+        req->recordComposition = NULL;\r
+    return ir_tcl_send_APDU (interp, p, apdu, "present", argv[0]);\r
+}\r
+\r
+/*\r
+ * do_loadFile: Load result set from file\r
+ */\r
+\r
+static int do_loadFile (void *o, Tcl_Interp *interp,\r
+                        int argc, char **argv)\r
+{\r
+    IrTcl_SetObj *setobj = o;\r
+    FILE *inf;\r
+    size_t size;\r
+    int  no = 1;\r
+    char *buf;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc != 3)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    inf = fopen (argv[2], "r");\r
+    if (!inf)\r
+    {\r
+        Tcl_AppendResult (interp, "Cannot open ", argv[2], NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    while ((buf = ir_tcl_fread_marc (inf, &size)))\r
+    {\r
+        IrTcl_RecordList *rl;\r
+\r
+        rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord, "F");\r
+        rl->u.dbrec.type = VAL_USMARC;\r
+        rl->u.dbrec.buf = buf;\r
+        rl->u.dbrec.size = size;\r
+        no++;\r
+    }\r
+    setobj->numberOfRecordsReturned = no-1;\r
+    fclose (inf);\r
+    return TCL_OK;\r
+}\r
+\r
+static IrTcl_Method ir_set_method_tab[] = {\r
+    { 0, "search",                  do_search },\r
+    { 0, "searchStatus",            do_searchStatus },\r
+    { 0, "presentStatus",           do_presentStatus },\r
+    { 0, "nextResultSetPosition",   do_nextResultSetPosition },\r
+    { 0, "setName",                 do_setName },\r
+    { 0, "resultCount",             do_resultCount },\r
+    { 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },\r
+    { 0, "present",                 do_present },\r
+    { 0, "type",                    do_type },\r
+    { 0, "getMarc",                 do_getMarc },\r
+    { 0, "getSutrs",                do_getSutrs },\r
+    { 0, "getGrs",                  do_getGrs },\r
+    { 0, "recordType",              do_recordType },\r
+    { 0, "recordElements",          do_recordElements },\r
+    { 0, "diag",                    do_diag },\r
+    { 0, "responseStatus",          do_responseStatus },\r
+    { 0, "loadFile",                do_loadFile },\r
+    { 0, NULL, NULL}\r
+};\r
+\r
+/* \r
+ * ir_set_obj_method: IR Set Object methods\r
+ */\r
+static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Methods tabs[3];\r
+    IrTcl_SetObj *p = clientData;\r
+\r
+    if (argc < 2)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    tabs[0].tab = ir_set_method_tab;\r
+    tabs[0].obj = p;\r
+    tabs[1].tab = ir_set_c_method_tab;\r
+    tabs[1].obj = &p->set_inher;\r
+    tabs[2].tab = NULL;\r
+\r
+    return ir_method (interp, argc, argv, tabs);\r
+}\r
+\r
+/* \r
+ * ir_set_obj_delete: IR Set Object disposal\r
+ */\r
+static void ir_set_obj_delete (ClientData clientData)\r
+{\r
+    IrTcl_Methods tabs[3];\r
+    IrTcl_SetObj *p = clientData;\r
+\r
+    logf (LOG_DEBUG, "ir set delete");\r
+\r
+    tabs[0].tab = ir_set_method_tab;\r
+    tabs[0].obj = p;\r
+    tabs[1].tab = ir_set_c_method_tab;\r
+    tabs[1].obj = &p->set_inher;\r
+    tabs[2].tab = NULL;\r
+\r
+    ir_method (NULL, -1, NULL, tabs);\r
+\r
+    free (p);\r
+}\r
+\r
+/*\r
+ * ir_set_obj_mk: IR Set Object creation\r
+ */\r
+static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_Methods tabs[3];\r
+    IrTcl_SetObj *obj;\r
+\r
+    if (argc < 2 || argc > 3)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    obj = ir_tcl_malloc (sizeof(*obj));\r
+    logf (LOG_DEBUG, "ir set create");\r
+    if (argc == 3)\r
+    {\r
+        Tcl_CmdInfo parent_info;\r
+        int i;\r
+        IrTcl_SetCObj *dst;\r
+        IrTcl_SetCObj *src;\r
+\r
+        if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))\r
+        {\r
+            interp->result = "No parent";\r
+            return TCL_ERROR;\r
+        }\r
+        obj->parent = (IrTcl_Obj *) parent_info.clientData;\r
+\r
+        dst = &obj->set_inher;\r
+        src = &obj->parent->set_inher;\r
+\r
+        if ((dst->num_databaseNames = src->num_databaseNames))\r
+            dst->databaseNames =\r
+                ir_tcl_malloc (sizeof (*dst->databaseNames)\r
+                               * dst->num_databaseNames);\r
+        else\r
+            dst->databaseNames = NULL;\r
+        for (i = 0; i < dst->num_databaseNames; i++)\r
+            if (ir_tcl_strdup (interp, &dst->databaseNames[i],\r
+                           src->databaseNames[i]) == TCL_ERROR)\r
+                return TCL_ERROR;\r
+        if (ir_tcl_strdup (interp, &dst->queryType, src->queryType)\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+\r
+        if (ir_tcl_strdup (interp, &dst->referenceId, src->referenceId)\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+\r
+        if (ir_tcl_strdup (interp, &dst->elementSetNames, src->elementSetNames)\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+\r
+        if (ir_tcl_strdup (interp, &dst->smallSetElementSetNames,\r
+                           src->smallSetElementSetNames)\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+\r
+        if (ir_tcl_strdup (interp, &dst->mediumSetElementSetNames,\r
+                           src->mediumSetElementSetNames)\r
+            == TCL_ERROR)\r
+            return TCL_ERROR;\r
+\r
+        if (src->preferredRecordSyntax && \r
+            (dst->preferredRecordSyntax \r
+             = ir_tcl_malloc (sizeof(*dst->preferredRecordSyntax))))\r
+            *dst->preferredRecordSyntax = *src->preferredRecordSyntax;\r
+        else\r
+            dst->preferredRecordSyntax = NULL;\r
+        dst->replaceIndicator = src->replaceIndicator;\r
+        dst->smallSetUpperBound = src->smallSetUpperBound;\r
+        dst->largeSetLowerBound = src->largeSetLowerBound;\r
+        dst->mediumSetPresentNumber = src->mediumSetPresentNumber;\r
+    }   \r
+    else\r
+        obj->parent = NULL;\r
+\r
+    tabs[0].tab = ir_set_method_tab;\r
+    tabs[0].obj = obj;\r
+    tabs[1].tab = NULL;\r
+\r
+    if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)\r
+        return TCL_ERROR;\r
+\r
+    Tcl_CreateCommand (interp, argv[1], ir_set_obj_method,\r
+                       (ClientData) obj, ir_set_obj_delete);\r
+    return TCL_OK;\r
+}\r
+\r
+/* ------------------------------------------------------- */\r
+\r
+/*\r
+ * do_scan: Perform scan \r
+ */\r
+static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    Z_ScanRequest *req;\r
+    Z_APDU *apdu;\r
+    IrTcl_ScanObj *obj = o;\r
+    IrTcl_Obj *p = obj->parent;\r
+    oident bib1;\r
+#if CCL2RPN\r
+    struct ccl_rpn_node *rpn;\r
+    int pos;\r
+#endif\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    if (argc != 3)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    if (!p->set_inher.num_databaseNames)\r
+    {\r
+        interp->result = "no databaseNames";\r
+        return TCL_ERROR;\r
+    }\r
+    if (!p->cs_link)\r
+    {\r
+        interp->result = "scan: not connected";\r
+        return TCL_ERROR;\r
+    }\r
+\r
+    bib1.proto = p->protocol_type;\r
+    bib1.class = CLASS_ATTSET;\r
+    bib1.value = VAL_BIB1;\r
+\r
+    apdu = zget_APDU (p->odr_out, Z_APDU_scanRequest);\r
+    req = apdu->u.scanRequest;\r
+\r
+    set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);\r
+    req->num_databaseNames = p->set_inher.num_databaseNames;\r
+    req->databaseNames = p->set_inher.databaseNames;\r
+    req->attributeSet = oid_getoidbyent (&bib1);\r
+\r
+#if !CCL2RPN\r
+    if (!(req->termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))\r
+    {\r
+        Tcl_AppendResult (interp, "Syntax error in query", NULL);\r
+        return TCL_ERROR;\r
+    }\r
+#else\r
+    rpn = ccl_find_str(p->bibset, argv[2], &r, &pos);\r
+    if (r)\r
+    {\r
+        Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg (r), NULL);\r
+        return TCL_ERROR;\r
+    }\r
+    ccl_pr_tree (rpn, stderr);\r
+    fprintf (stderr, "\n");\r
+    if (!(req->termListAndStartPoint = ccl_scan_query (rpn)))\r
+        return TCL_ERROR;\r
+#endif\r
+    req->stepSize = &obj->stepSize;\r
+    req->numberOfTermsRequested = &obj->numberOfTermsRequested;\r
+    req->preferredPositionInResponse = &obj->preferredPositionInResponse;\r
+    logf (LOG_DEBUG, "stepSize=%d", *req->stepSize);\r
+    logf (LOG_DEBUG, "numberOfTermsRequested=%d",\r
+          *req->numberOfTermsRequested);\r
+    logf (LOG_DEBUG, "preferredPositionInResponse=%d",\r
+          *req->preferredPositionInResponse);\r
+    \r
+    return ir_tcl_send_APDU (interp, p, apdu, "scan", argv[0]);\r
+}\r
+\r
+/*\r
+ * do_stepSize: Set/get replace Step Size\r
+ */\r
+static int do_stepSize (void *obj, Tcl_Interp *interp,\r
+                        int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+    if (argc <= 0)\r
+    {\r
+        p->stepSize = 0;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->stepSize, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_numberOfTermsRequested: Set/get Number of Terms requested\r
+ */\r
+static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,\r
+                                      int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->numberOfTermsRequested = 20;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);\r
+}\r
+\r
+\r
+/*\r
+ * do_preferredPositionInResponse: Set/get preferred Position\r
+ */\r
+static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,\r
+                                           int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+\r
+    if (argc <= 0)\r
+    {\r
+        p->preferredPositionInResponse = 1;\r
+        return TCL_OK;\r
+    }\r
+    return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_scanStatus: Get scan status\r
+ */\r
+static int do_scanStatus (void *obj, Tcl_Interp *interp,\r
+                          int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&p->scanStatus, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_numberOfEntriesReturned: Get number of Entries returned\r
+ */\r
+static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,\r
+                                       int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_positionOfTerm: Get position of Term\r
+ */\r
+static int do_positionOfTerm (void *obj, Tcl_Interp *interp,\r
+                              int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+\r
+    if (argc <= 0)\r
+        return TCL_OK;\r
+    return get_set_int (&p->positionOfTerm, interp, argc, argv);\r
+}\r
+\r
+/*\r
+ * do_scanLine: get Scan Line (surrogate or normal) after response\r
+ */\r
+static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)\r
+{\r
+    IrTcl_ScanObj *p = obj;\r
+    int i;\r
+    char numstr[20];\r
+\r
+    if (argc == 0)\r
+    {\r
+        p->entries_flag = 0;\r
+        p->entries = NULL;\r
+        p->nonSurrogateDiagnosticNum = 0;\r
+        p->nonSurrogateDiagnosticList = 0;\r
+        return TCL_OK;\r
+    }\r
+    else if (argc == -1)\r
+    {\r
+        p->entries_flag = 0;\r
+        /* release entries */\r
+        p->entries = NULL;\r
+\r
+        ir_deleteDiags (&p->nonSurrogateDiagnosticList, \r
+                        &p->nonSurrogateDiagnosticNum);\r
+        return TCL_OK;\r
+    }\r
+    if (argc != 3)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    if (Tcl_GetInt (interp, argv[2], &i) == TCL_ERROR)\r
+        return TCL_ERROR;\r
+    if (!p->entries_flag || p->which != Z_ListEntries_entries || !p->entries\r
+        || i >= p->num_entries || i < 0)\r
+        return TCL_OK;\r
+    switch (p->entries[i].which)\r
+    {\r
+    case Z_Entry_termInfo:\r
+        Tcl_AppendElement (interp, "T");\r
+        if (p->entries[i].u.term.buf)\r
+            Tcl_AppendElement (interp, p->entries[i].u.term.buf);\r
+        else\r
+            Tcl_AppendElement (interp, "");\r
+        sprintf (numstr, "%d", p->entries[i].u.term.globalOccurrences);\r
+        Tcl_AppendElement (interp, numstr);\r
+        break;\r
+    case Z_Entry_surrogateDiagnostic:\r
+        Tcl_AppendElement (interp, "SD");\r
+        return ir_diagResult (interp, p->entries[i].u.diag.list,\r
+                              p->entries[i].u.diag.num);\r
+        break;\r
+    }\r
+    return TCL_OK;\r
+}\r
+\r
+static IrTcl_Method ir_scan_method_tab[] = {\r
+    { 0, "scan",                    do_scan },\r
+    { 0, "stepSize",                do_stepSize },\r
+    { 0, "numberOfTermsRequested",  do_numberOfTermsRequested },\r
+    { 0, "preferredPositionInResponse", do_preferredPositionInResponse },\r
+    { 0, "scanStatus",              do_scanStatus },\r
+    { 0, "numberOfEntriesReturned", do_numberOfEntriesReturned },\r
+    { 0, "positionOfTerm",          do_positionOfTerm },\r
+    { 0, "scanLine",                do_scanLine },\r
+    { 0, NULL, NULL}\r
+};\r
+\r
+/* \r
+ * ir_scan_obj_method: IR Scan Object methods\r
+ */\r
+static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,\r
+                               int argc, char **argv)\r
+{\r
+    IrTcl_Methods tabs[2];\r
+\r
+    if (argc < 2)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    tabs[0].tab = ir_scan_method_tab;\r
+    tabs[0].obj = clientData;\r
+    tabs[1].tab = NULL;\r
+\r
+    return ir_method (interp, argc, argv, tabs);\r
+}\r
+\r
+/* \r
+ * ir_scan_obj_delete: IR Scan Object disposal\r
+ */\r
+static void ir_scan_obj_delete (ClientData clientData)\r
+{\r
+    IrTcl_Methods tabs[2];\r
+    IrTcl_ScanObj *obj = clientData;\r
+\r
+    tabs[0].tab = ir_scan_method_tab;\r
+    tabs[0].obj = obj;\r
+    tabs[1].tab = NULL;\r
+\r
+    ir_method (NULL, -1, NULL, tabs);\r
+    free (obj);\r
+}\r
+\r
+/* \r
+ * ir_scan_obj_mk: IR Scan Object creation\r
+ */\r
+static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,\r
+                           int argc, char **argv)\r
+{\r
+    Tcl_CmdInfo parent_info;\r
+    IrTcl_ScanObj *obj;\r
+    IrTcl_Methods tabs[2];\r
+\r
+    if (argc != 3)\r
+    {\r
+        interp->result = "wrong # args";\r
+        return TCL_ERROR;\r
+    }\r
+    if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))\r
+    {\r
+        interp->result = "No parent";\r
+        return TCL_ERROR;\r
+    }\r
+    obj = ir_tcl_malloc (sizeof(*obj));\r
+    obj->parent = (IrTcl_Obj *) parent_info.clientData;\r
+\r
+    tabs[0].tab = ir_scan_method_tab;\r
+    tabs[0].obj = obj;\r
+    tabs[1].tab = NULL;\r
+\r
+    if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)\r
+        return TCL_ERROR;\r
+    Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,\r
+                       (ClientData) obj, ir_scan_obj_delete);\r
+    return TCL_OK;\r
+}\r
+\r
+/* ------------------------------------------------------- */\r
+\r
+static void ir_initResponse (void *obj, Z_InitResponse *initrs)\r
+{\r
+    IrTcl_Obj *p = obj;\r
+\r
+    p->initResult = *initrs->result ? 1 : 0;\r
+    if (!*initrs->result)\r
+        logf (LOG_DEBUG, "Connection rejected by target");\r
+    else\r
+        logf (LOG_DEBUG, "Connection accepted by target");\r
+\r
+    get_referenceId (&p->set_inher.referenceId, initrs->referenceId);\r
+\r
+    free (p->targetImplementationId);\r
+    ir_tcl_strdup (p->interp, &p->targetImplementationId,\r
+               initrs->implementationId);\r
+    free (p->targetImplementationName);\r
+    ir_tcl_strdup (p->interp, &p->targetImplementationName,\r
+               initrs->implementationName);\r
+    free (p->targetImplementationVersion);\r
+    ir_tcl_strdup (p->interp, &p->targetImplementationVersion,\r
+               initrs->implementationVersion);\r
+\r
+    p->maximumRecordSize = *initrs->maximumRecordSize;\r
+    p->preferredMessageSize = *initrs->preferredMessageSize;\r
+    \r
+    memcpy (&p->options, initrs->options, sizeof(initrs->options));\r
+    memcpy (&p->protocolVersion, initrs->protocolVersion,\r
+            sizeof(initrs->protocolVersion));\r
+    free (p->userInformationField);\r
+    p->userInformationField = NULL;\r
+    if (initrs->userInformationField)\r
+    {\r
+        int len;\r
+\r
+        if (initrs->userInformationField->which == ODR_EXTERNAL_octet && \r
+            (p->userInformationField =\r
+             ir_tcl_malloc ((len = \r
+                             initrs->userInformationField->\r
+                             u.octet_aligned->len) +1)))\r
+        {\r
+            memcpy (p->userInformationField,\r
+                    initrs->userInformationField->u.octet_aligned->buf,\r
+                        len);\r
+            (p->userInformationField)[len] = '\0';\r
+        }\r
+    }\r
+}\r
+\r
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num)\r
+{\r
+    int i;\r
+    for (i = 0; i<*dst_num; i++)\r
+        free (dst_list[i]->addinfo);\r
+    free (*dst_list);\r
+    *dst_list = NULL;\r
+    *dst_num = 0;\r
+}\r
+\r
+static void ir_handleDiags (IrTcl_Diagnostic **dst_list, int *dst_num,\r
+                    Z_DiagRec **list, int num)\r
+{\r
+    int i;\r
+    char *addinfo;\r
+\r
+    *dst_num = num;\r
+    *dst_list = ir_tcl_malloc (sizeof(**dst_list) * num);\r
+    for (i = 0; i<num; i++)\r
+    {\r
+        switch (list[i]->which)\r
+        {\r
+        case Z_DiagRec_defaultFormat:\r
+            (*dst_list)[i].condition = *list[i]->u.defaultFormat->condition;\r
+            addinfo = list[i]->u.defaultFormat->addinfo;\r
+            if (addinfo && \r
+                ((*dst_list)[i].addinfo = ir_tcl_malloc (strlen(addinfo)+1)))\r
+                strcpy ((*dst_list)[i].addinfo, addinfo);\r
+            break;\r
+        default:\r
+            (*dst_list)[i].addinfo = NULL;\r
+            (*dst_list)[i].condition = 0;\r
+        }\r
+    }\r
+}\r
+\r
+static void ir_handleRecords (void *o, Z_Records *zrs, IrTcl_SetObj *setobj,\r
+                              const char *elements)\r
+{\r
+    IrTcl_Obj *p = o;\r
+\r
+    int offset;\r
+    IrTcl_RecordList *rl;\r
+\r
+    setobj->which = zrs->which;\r
+    setobj->recordFlag = 1;\r
+    \r
+    ir_deleteDiags (&setobj->nonSurrogateDiagnosticList,\r
+                    &setobj->nonSurrogateDiagnosticNum);\r
+    if (zrs->which == Z_Records_DBOSD)\r
+    {\r
+        setobj->numberOfRecordsReturned = \r
+            zrs->u.databaseOrSurDiagnostics->num_records;\r
+        logf (LOG_DEBUG, "Got %d records", setobj->numberOfRecordsReturned);\r
+        for (offset = 0; offset<setobj->numberOfRecordsReturned; offset++)\r
+        {\r
+            rl = new_IR_record (setobj, setobj->start + offset,\r
+                                zrs->u.databaseOrSurDiagnostics->\r
+                                records[offset]->which,\r
+                                elements);\r
+            if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)\r
+            {\r
+                ir_handleDiags (&rl->u.surrogateDiagnostics.list,\r
+                                &rl->u.surrogateDiagnostics.num,\r
+                                &zrs->u.databaseOrSurDiagnostics->\r
+                                records[offset]->u.surrogateDiagnostic,\r
+                                1);\r
+            } \r
+            else\r
+            {\r
+                Z_DatabaseRecord *zr; \r
+                Z_External *oe;\r
+                struct oident *ident;\r
+                \r
+                zr = zrs->u.databaseOrSurDiagnostics->records[offset]\r
+                    ->u.databaseRecord;\r
+                oe = (Z_External*) zr;\r
+                rl->u.dbrec.size = zr->u.octet_aligned->len;\r
+\r
+                if ((ident = oid_getentbyoid (oe->direct_reference)))\r
+                    rl->u.dbrec.type = ident->value;\r
+                else\r
+                    rl->u.dbrec.type = VAL_USMARC;\r
+\r
+                if (oe->which == ODR_EXTERNAL_octet && rl->u.dbrec.size > 0)\r
+                {\r
+                    char *buf = (char*) zr->u.octet_aligned->buf;\r
+                    if ((rl->u.dbrec.buf = ir_tcl_malloc (rl->u.dbrec.size)))\r
+                        memcpy (rl->u.dbrec.buf, buf, rl->u.dbrec.size);\r
+                }\r
+                else if (rl->u.dbrec.type == VAL_SUTRS && \r
+                         oe->which == Z_External_sutrs)\r
+                {\r
+                    odr_setbuf (p->odr_in, (char*) oe->u.single_ASN1_type->buf,\r
+                                oe->u.single_ASN1_type->len, 0);\r
+                    if ((rl->u.dbrec.buf = ir_tcl_malloc (oe->u.sutrs->len+1)))\r
+                    {\r
+                        memcpy (rl->u.dbrec.buf, oe->u.sutrs->buf,\r
+                                oe->u.sutrs->len);\r
+                        rl->u.dbrec.buf[oe->u.sutrs->len] = '\0';\r
+                    }\r
+                    rl->u.dbrec.size = oe->u.sutrs->len;\r
+                }\r
+                else if (rl->u.dbrec.type == VAL_GRS1 && \r
+                         oe->which == Z_External_grs1)\r
+                {\r
+                    ir_tcl_read_grs (oe->u.grs1, &rl->u.dbrec.u.grs1);\r
+                    rl->u.dbrec.buf = NULL;\r
+                }\r
+                else\r
+                    rl->u.dbrec.buf = NULL;\r
+            }\r
+        }\r
+    }\r
+    else if (zrs->which == Z_Records_multipleNSD)\r
+    {\r
+        logf (LOG_DEBUG, "multipleNonSurrogateDiagnostic %d",\r
+              zrs->u.multipleNonSurDiagnostics->num_diagRecs);\r
+        setobj->numberOfRecordsReturned = 0;\r
+        ir_handleDiags (&setobj->nonSurrogateDiagnosticList,\r
+                        &setobj->nonSurrogateDiagnosticNum,\r
+                        zrs->u.multipleNonSurDiagnostics->diagRecs,\r
+                        zrs->u.multipleNonSurDiagnostics->num_diagRecs);\r
+    }\r
+    else\r
+    {\r
+        logf (LOG_DEBUG, "NonSurrogateDiagnostic");\r
+        setobj->numberOfRecordsReturned = 0;\r
+        ir_handleDiags (&setobj->nonSurrogateDiagnosticList,\r
+                        &setobj->nonSurrogateDiagnosticNum,\r
+                        &zrs->u.nonSurrogateDiagnostic,\r
+                        1);\r
+    }\r
+}\r
+\r
+static void ir_searchResponse (void *o, Z_SearchResponse *searchrs,\r
+                               IrTcl_SetObj *setobj)\r
+{    \r
+    Z_Records *zrs = searchrs->records;\r
+\r
+    logf (LOG_DEBUG, "Received search response");\r
+    if (!setobj)\r
+    {\r
+        logf (LOG_DEBUG, "Search response, no object!");\r
+        return;\r
+    }\r
+    setobj->searchStatus = searchrs->searchStatus ? 1 : 0;\r
+    get_referenceId (&setobj->set_inher.referenceId, searchrs->referenceId);\r
+    setobj->resultCount = *searchrs->resultCount;\r
+    if (searchrs->presentStatus)\r
+        setobj->presentStatus = *searchrs->presentStatus;\r
+    if (searchrs->nextResultSetPosition)\r
+        setobj->nextResultSetPosition = *searchrs->nextResultSetPosition;\r
+\r
+    logf (LOG_DEBUG, "Search response %d, %d hits", \r
+          setobj->searchStatus, setobj->resultCount);\r
+    if (zrs)\r
+    {\r
+        const char *es;\r
+        if (setobj->resultCount <= setobj->set_inher.smallSetUpperBound)\r
+            es = setobj->set_inher.smallSetElementSetNames;\r
+        else \r
+            es = setobj->set_inher.mediumSetElementSetNames;\r
+        ir_handleRecords (o, zrs, setobj, es);\r
+    }\r
+    else\r
+        setobj->recordFlag = 0;\r
+}\r
+\r
+\r
+static void ir_presentResponse (void *o, Z_PresentResponse *presrs,\r
+                                IrTcl_SetObj *setobj)\r
+{\r
+    Z_Records *zrs = presrs->records;\r
+    \r
+    logf (LOG_DEBUG, "Received present response");\r
+    if (!setobj)\r
+    {\r
+        logf (LOG_DEBUG, "Present response, no object!");\r
+        return;\r
+    }\r
+    setobj->presentStatus = *presrs->presentStatus;\r
+    get_referenceId (&setobj->set_inher.referenceId, presrs->referenceId);\r
+    setobj->nextResultSetPosition = *presrs->nextResultSetPosition;\r
+    if (zrs)\r
+        ir_handleRecords (o, zrs, setobj, setobj->set_inher.elementSetNames);\r
+    else\r
+    {\r
+        setobj->recordFlag = 0;\r
+        logf (LOG_DEBUG, "No records!");\r
+    }\r
+}\r
+\r
+static void ir_scanResponse (void *o, Z_ScanResponse *scanrs,\r
+                             IrTcl_ScanObj *scanobj)\r
+{\r
+    IrTcl_Obj *p = o;\r
+    \r
+    logf (LOG_DEBUG, "Received scanResponse");\r
+\r
+    get_referenceId (&p->set_inher.referenceId, scanrs->referenceId);\r
+    scanobj->scanStatus = *scanrs->scanStatus;\r
+    logf (LOG_DEBUG, "scanStatus=%d", scanobj->scanStatus);\r
+\r
+    if (scanrs->stepSize)\r
+        scanobj->stepSize = *scanrs->stepSize;\r
+    logf (LOG_DEBUG, "stepSize=%d", scanobj->stepSize);\r
+\r
+    scanobj->numberOfEntriesReturned = *scanrs->numberOfEntriesReturned;\r
+    logf (LOG_DEBUG, "numberOfEntriesReturned=%d",\r
+          scanobj->numberOfEntriesReturned);\r
+\r
+    if (scanrs->positionOfTerm)\r
+        scanobj->positionOfTerm = *scanrs->positionOfTerm;\r
+    else\r
+        scanobj->positionOfTerm = -1;\r
+    logf (LOG_DEBUG, "positionOfTerm=%d", scanobj->positionOfTerm);\r
+\r
+    free (scanobj->entries);\r
+    scanobj->entries = NULL;\r
+\r
+    ir_deleteDiags (&scanobj->nonSurrogateDiagnosticList,\r
+                    &scanobj->nonSurrogateDiagnosticNum);\r
+    if (scanrs->entries)\r
+    {\r
+        int i;\r
+        Z_Entry *ze;\r
+\r
+        scanobj->entries_flag = 1;\r
+        scanobj->which = scanrs->entries->which;\r
+        switch (scanobj->which)\r
+        {\r
+        case Z_ListEntries_entries:\r
+            scanobj->num_entries = scanrs->entries->u.entries->num_entries;\r
+            scanobj->entries = ir_tcl_malloc (scanobj->num_entries * \r
+                                       sizeof(*scanobj->entries));\r
+            for (i=0; i<scanobj->num_entries; i++)\r
+            {\r
+                ze = scanrs->entries->u.entries->entries[i];\r
+                scanobj->entries[i].which = ze->which;\r
+                switch (ze->which)\r
+                {\r
+                case Z_Entry_termInfo:\r
+                    if (ze->u.termInfo->term->which == Z_Term_general)\r
+                    {\r
+                        int l = ze->u.termInfo->term->u.general->len;\r
+                        scanobj->entries[i].u.term.buf = ir_tcl_malloc (1+l);\r
+                        memcpy (scanobj->entries[i].u.term.buf, \r
+                                ze->u.termInfo->term->u.general->buf,\r
+                                l);\r
+                        scanobj->entries[i].u.term.buf[l] = '\0';\r
+                    }\r
+                    else\r
+                        scanobj->entries[i].u.term.buf = NULL;\r
+                    if (ze->u.termInfo->globalOccurrences)\r
+                        scanobj->entries[i].u.term.globalOccurrences = \r
+                            *ze->u.termInfo->globalOccurrences;\r
+                    else\r
+                        scanobj->entries[i].u.term.globalOccurrences = 0;\r
+                    break;\r
+                case Z_Entry_surrogateDiagnostic:\r
+                    ir_handleDiags (&scanobj->entries[i].u.diag.list,\r
+                                    &scanobj->entries[i].u.diag.num,\r
+                                    &ze->u.surrogateDiagnostic,\r
+                                    1);\r
+                    break;\r
+                }\r
+            }\r
+            break;\r
+        case Z_ListEntries_nonSurrogateDiagnostics:\r
+            ir_handleDiags (&scanobj->nonSurrogateDiagnosticList,\r
+                            &scanobj->nonSurrogateDiagnosticNum,\r
+                            scanrs->entries->u.nonSurrogateDiagnostics->\r
+                            diagRecs,\r
+                            scanrs->entries->u.nonSurrogateDiagnostics->\r
+                            num_diagRecs);\r
+            break;\r
+        }\r
+    }\r
+    else\r
+        scanobj->entries_flag = 0;\r
+}\r
+\r
+/*\r
+ * ir_select_read: handle incoming packages\r
+ */\r
+void ir_select_read (ClientData clientData)\r
+{\r
+    IrTcl_Obj *p = clientData;\r
+    Z_APDU *apdu;\r
+    int r;\r
+    IrTcl_Request *rq;\r
+    char *object_name;\r
+    Tcl_CmdInfo cmd_info;\r
+\r
+    if (p->state == IR_TCL_R_Connecting)\r
+    {\r
+        r = cs_rcvconnect (p->cs_link);\r
+        if (r == 1)\r
+        {\r
+            logf (LOG_WARN, "cs_rcvconnect returned 1");\r
+            return;\r
+        }\r
+        p->state = IR_TCL_R_Idle;\r
+        ir_select_remove_write (cs_fileno (p->cs_link), p);\r
+        if (r < 0)\r
+        {\r
+            logf (LOG_DEBUG, "cs_rcvconnect error");\r
+            if (p->failback)\r
+            {\r
+                p->failInfo = IR_TCL_FAIL_CONNECT;\r
+                IrTcl_eval (p->interp, p->failback);\r
+            }\r
+            do_disconnect (p, NULL, 2, NULL);\r
+            return;\r
+        }\r
+        p->state = IR_TCL_R_Idle;\r
+        if (p->callback)\r
+            IrTcl_eval (p->interp, p->callback);\r
+        if (p->cs_link && p->request_queue && p->state == IR_TCL_R_Idle)\r
+            ir_tcl_send_q (p, p->request_queue, "x");\r
+        return;\r
+    }\r
+    do\r
+    {\r
+        /* signal one more use of ir object - callbacks must not\r
+           release the ir memory (p pointer) */\r
+        p->state = IR_TCL_R_Reading;\r
+        ++(p->ref_count);\r
+\r
+        /* read incoming APDU */\r
+        if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) <= 0)\r
+        {\r
+            logf (LOG_DEBUG, "cs_get failed, code %d", r);\r
+            ir_select_remove (cs_fileno (p->cs_link), p);\r
+            do_disconnect (p, NULL, 2, NULL);\r
+            if (p->failback)\r
+            {\r
+                p->failInfo = IR_TCL_FAIL_READ;\r
+                IrTcl_eval (p->interp, p->failback);\r
+            }\r
+            /* release ir object now if callback deleted it */\r
+            ir_obj_delete (p);\r
+            return;\r
+        }        \r
+        if (r == 1)\r
+            return ;\r
+        /* got complete APDU. Now decode */\r
+        odr_setbuf (p->odr_in, p->buf_in, r, 0);\r
+        logf (LOG_DEBUG, "cs_get ok, got %d", r);\r
+        if (!z_APDU (p->odr_in, &apdu, 0))\r
+        {\r
+            logf (LOG_DEBUG, "%s", odr_errmsg (odr_geterror (p->odr_in)));\r
+            do_disconnect (p, NULL, 2, NULL);\r
+            if (p->failback)\r
+            {\r
+                p->failInfo = IR_TCL_FAIL_IN_APDU;\r
+                IrTcl_eval (p->interp, p->failback);\r
+            }\r
+            /* release ir object now if failback deleted it */\r
+            ir_obj_delete (p);\r
+            return;\r
+        }\r
+        /* handle APDU and invoke callback */\r
+        rq = p->request_queue;\r
+        if (!rq)\r
+        {\r
+            logf (LOG_FATAL, "Internal error. No queue entry");\r
+            exit (1);\r
+        }\r
+        object_name = rq->object_name;\r
+        logf (LOG_DEBUG, "getCommandInfo (%s)", object_name);\r
+        if (Tcl_GetCommandInfo (p->interp, object_name, &cmd_info))\r
+        {\r
+            switch(apdu->which)\r
+            {\r
+            case Z_APDU_initResponse:\r
+                ir_initResponse (p, apdu->u.initResponse);\r
+                break;\r
+            case Z_APDU_searchResponse:\r
+                ir_searchResponse (p, apdu->u.searchResponse,\r
+                                   (IrTcl_SetObj *) cmd_info.clientData);\r
+                break;\r
+            case Z_APDU_presentResponse:\r
+                ir_presentResponse (p, apdu->u.presentResponse,\r
+                                    (IrTcl_SetObj *) cmd_info.clientData);\r
+                break;\r
+            case Z_APDU_scanResponse:\r
+                ir_scanResponse (p, apdu->u.scanResponse, \r
+                                 (IrTcl_ScanObj *) cmd_info.clientData);\r
+                break;\r
+            default:\r
+                logf (LOG_WARN, "Received unknown APDU type (%d)",\r
+                      apdu->which);\r
+                do_disconnect (p, NULL, 2, NULL);\r
+                if (p->failback)\r
+                {\r
+                    p->failInfo = IR_TCL_FAIL_UNKNOWN_APDU;\r
+                    IrTcl_eval (p->interp, p->failback);\r
+                }\r
+                return;\r
+            }\r
+        }\r
+        p->request_queue = rq->next;\r
+        p->state = IR_TCL_R_Idle;\r
+        \r
+        if (rq->callback)\r
+            IrTcl_eval (p->interp, rq->callback);\r
+        free (rq->buf_out);\r
+        free (rq->callback);\r
+        free (rq->object_name);\r
+        free (rq);\r
+        odr_reset (p->odr_in);\r
+        if (p->ref_count == 1)\r
+        {\r
+            ir_obj_delete (p);\r
+            return;\r
+        }\r
+        --(p->ref_count);\r
+    } while (p->cs_link && cs_more (p->cs_link));\r
+    if (p->cs_link && p->request_queue && p->state == IR_TCL_R_Idle)\r
+        ir_tcl_send_q (p, p->request_queue, "x");\r
+}\r
+\r
+/*\r
+ * ir_select_write: handle outgoing packages - not yet written.\r
+ */\r
+void ir_select_write (ClientData clientData)\r
+{\r
+    IrTcl_Obj *p = clientData;\r
+    int r;\r
+    IrTcl_Request *rq;\r
+\r
+    logf (LOG_DEBUG, "In write handler");\r
+    if (p->state == IR_TCL_R_Connecting)\r
+    {\r
+        r = cs_rcvconnect (p->cs_link);\r
+        if (r == 1)\r
+            return;\r
+        p->state = IR_TCL_R_Idle;\r
+        if (r < 0)\r
+        {\r
+            logf (LOG_DEBUG, "cs_rcvconnect error");\r
+            ir_select_remove_write (cs_fileno (p->cs_link), p);\r
+            if (p->failback)\r
+            {\r
+                p->failInfo = IR_TCL_FAIL_CONNECT;\r
+                IrTcl_eval (p->interp, p->failback);\r
+            }\r
+            do_disconnect (p, NULL, 2, NULL);\r
+            return;\r
+        }\r
+        ir_select_remove_write (cs_fileno (p->cs_link), p);\r
+        if (p->callback)\r
+            IrTcl_eval (p->interp, p->callback);\r
+        return;\r
+    }\r
+    rq = p->request_queue;\r
+    if (!rq || !rq->buf_out)\r
+        return;\r
+    assert (rq);\r
+    if ((r=cs_put (p->cs_link, rq->buf_out, rq->len_out)) < 0)\r
+    {\r
+        logf (LOG_DEBUG, "select write fail");\r
+        if (p->failback)\r
+        {\r
+            p->failInfo = IR_TCL_FAIL_WRITE;\r
+            IrTcl_eval (p->interp, p->failback);\r
+        }\r
+        free (rq->buf_out);\r
+        rq->buf_out = NULL;\r
+        do_disconnect (p, NULL, 2, NULL);\r
+    }\r
+    else if (r == 0)            /* remove select bit */\r
+    {\r
+        p->state = IR_TCL_R_Waiting;\r
+        ir_select_remove_write (cs_fileno (p->cs_link), p);\r
+        free (rq->buf_out);\r
+        rq->buf_out = NULL;\r
+    }\r
+}\r
+\r
+/* ------------------------------------------------------- */\r
+\r
+/*\r
+ * Irtcl_init: Registration of TCL commands.\r
+ */\r
+int Irtcl_Init (Tcl_Interp *interp)\r
+{\r
+    Tcl_CreateCommand (interp, "ir", ir_obj_mk, (ClientData) NULL,\r
+                       (Tcl_CmdDeleteProc *) NULL);\r
+    Tcl_CreateCommand (interp, "ir-set", ir_set_obj_mk,\r
+                       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);\r
+    Tcl_CreateCommand (interp, "ir-scan", ir_scan_obj_mk,\r
+                       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);\r
+    return TCL_OK;\r
+}\r
+\r