X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=ir-tcl.c;h=3d6eea94d226a323861c2d85668c25bb7c584b13;hb=2eebe462e1445d88490289b7011886b4cbba307d;hp=94f09c147dc94bb8525419a4cdbe3304ca6b3de0;hpb=8fb81d0448e7aac2a546ac3cf2c46cd4fc6ee9c3;p=ir-tcl-moved-to-github.git

diff --git a/ir-tcl.c b/ir-tcl.c
index 94f09c1..3d6eea9 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -1,9 +1,44 @@
 /*
  * IR toolkit for tcl/tk
  * (c) Index Data 1995
+ * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.7  1995-03-14 17:32:29  adam
+ * 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
@@ -27,50 +62,62 @@
 #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 {
-    COMSTACK cs_link;
+    char       *cs_type;
+    int         connectFlag;
+    COMSTACK    cs_link;
+
 
-    int preferredMessageSize;
-    int maximumMessageSize;
+    int         preferredMessageSize;
+    int         maximumRecordSize;
     Odr_bitmask options;
     Odr_bitmask protocolVersion;
-    char *idAuthentication;
-    char *implementationName;
-    char *implementationId;
+    char       *idAuthentication;
+    char       *implementationName;
+    char       *implementationId;
 
-    char *hostname;
+    char       *hostname;
    
-    char *buf_out;
-    int  len_out;
+    char       *buf_out;
+    int         len_out;
 
-    char *buf_in;
-    int  len_in;
+    char       *buf_in;
+    int         len_in;
 
-    ODR odr_in;
-    ODR odr_out;
-    ODR odr_pr;
+    char       *sbuf;
+    int         slen;
+
+    ODR         odr_in;
+    ODR         odr_out;
+    ODR         odr_pr;
 
     Tcl_Interp *interp;
-    char *callback;
+    char       *callback;
 
-    int smallSetUpperBound;
-    int largeSetLowerBound;
-    int mediumSetPresentNumber;
-    int replaceIndicator;
-    char **databaseNames;
-    int num_databaseNames;
-    char *query_method;
+    int         smallSetUpperBound;
+    int         largeSetLowerBound;
+    int         mediumSetPresentNumber;
+    int         replaceIndicator;
+    char      **databaseNames;
+    int         num_databaseNames;
+    char       *query_method;
 
-    CCL_bibset bibset;
+    CCL_bibset  bibset;
 
     struct IRSetObj_ *child;
 } IRObj;
@@ -83,31 +130,79 @@ typedef struct IRRecordList_ {
             Iso2709Rec rec;
         } marc;
         struct {
-            int code;
-            char *add_info;
+            int  condition;
+            char *addinfo;
         } diag;
     } u;
     struct IRRecordList_ *next;
 } IRRecordList;
 
 typedef struct IRSetObj_ {
-    IRObj *parent;
-    int resultCount;
-    int start;
-    int number;
-    int numberOfRecordsReturned;
-    Z_Records *z_records;
+    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);
+    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.
  */
@@ -235,14 +330,13 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
     Z_APDU apdu, *apdup;
     IRObj *p = obj;
     Z_InitRequest req;
-    char *sbuf;
-    int slen;
+    int r;
 
     req.referenceId = 0;
     req.options = &p->options;
     req.protocolVersion = &p->protocolVersion;
     req.preferredMessageSize = &p->preferredMessageSize;
-    req.maximumRecordSize = &p->maximumMessageSize;
+    req.maximumRecordSize = &p->maximumRecordSize;
 
     req.idAuthentication = p->idAuthentication;
     req.implementationId = p->implementationId;
@@ -261,13 +355,19 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
         odr_reset (p->odr_out);
         return TCL_ERROR;
     }
-    sbuf = odr_getbuf (p->odr_out, &slen);
-    if (cs_put (p->cs_link, sbuf, slen) < 0)
-    {
+    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;
     }
-    printf("Sent initializeRequest (%d bytes).\n", slen);
+    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;
 }
 
@@ -312,19 +412,19 @@ static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
 }
 
 /*
- * do_maximumMessageSize: Set/get maximum message size
+ * do_maximumRecordSize: Set/get maximum record size
  */
-static int do_maximumMessageSize (void *obj, Tcl_Interp *interp,
+static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
     char buf[20];
     if (argc == 3)
     {
         if (Tcl_GetInt (interp, argv[2], 
-                        &((IRObj *)obj)->maximumMessageSize)==TCL_ERROR)
+                        &((IRObj *)obj)->maximumRecordSize)==TCL_ERROR)
             return TCL_ERROR;
     }
-    sprintf (buf, "%d", ((IRObj *)obj)->maximumMessageSize);
+    sprintf (buf, "%d", ((IRObj *)obj)->maximumRecordSize);
     Tcl_AppendResult (interp, buf, NULL);
     return TCL_OK;
 }
@@ -392,6 +492,7 @@ static int do_connect (void *obj, Tcl_Interp *interp,
 {
     void *addr;
     IRObj *p = obj;
+    int r;
 
     if (argc == 3)
     {
@@ -400,8 +501,9 @@ static int do_connect (void *obj, Tcl_Interp *interp,
             interp->result = "already connected";
             return TCL_ERROR;
         }
-        if (cs_type(p->cs_link) == tcpip_type)
+        if (!strcmp (p->cs_type, "tcpip"))
         {
+            p->cs_link = cs_create (tcpip_type, CS_BLOCK);
             addr = tcpip_strtoaddr (argv[2]);
             if (!addr)
             {
@@ -410,8 +512,10 @@ static int do_connect (void *obj, Tcl_Interp *interp,
             }
             printf ("tcp/ip connect %s\n", argv[2]);
         }
-        else if (cs_type (p->cs_link) == mosi_type)
+#if MOSI
+        else if (!strcmp (p->cs_type, "mosi"))
         {
+            p->cs_link = cs_create (mosi_type, CS_BLOCK);
             addr = mosi_strtoaddr (argv[2]);
             if (!addr)
             {
@@ -420,17 +524,33 @@ static int do_connect (void *obj, Tcl_Interp *interp,
             }
             printf ("mosi connect %s\n", argv[2]);
         }
-        if (cs_connect (p->cs_link, addr) < 0)
+#endif
+        else 
         {
-            interp->result = "cs_connect fail";
-            do_disconnect (p, interp, argc, argv);
+            interp->result = "unknown cs 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_AppendResult (interp, p->hostname, NULL);
+    Tcl_AppendElement (interp, p->hostname);
     return TCL_OK;
 }
 
@@ -447,21 +567,10 @@ static int do_disconnect (void *obj, Tcl_Interp *interp,
         free (p->hostname);
         p->hostname = NULL;
         ir_select_remove (cs_fileno (p->cs_link), p);
-    }
-    if (cs_type (p->cs_link) == tcpip_type)
-    {
-        cs_close (p->cs_link);
-        p->cs_link = cs_create (tcpip_type, 0);
-    }
-    else if (cs_type (p->cs_link) == mosi_type)
-    {
+
+        assert (p->cs_link);
         cs_close (p->cs_link);
-        p->cs_link = cs_create (mosi_type, 0);
-    }
-    else
-    {
-        interp->result = "unknown comstack type";
-        return TCL_ERROR;
+        p->cs_link = NULL;
     }
     return TCL_OK;
 }
@@ -469,27 +578,18 @@ static int do_disconnect (void *obj, Tcl_Interp *interp,
 /*
  * do_comstack: Set/get comstack method on IR object
  */
-static int do_comstack (void *obj, Tcl_Interp *interp,
+static int do_comstack (void *o, Tcl_Interp *interp,
 		        int argc, char **argv)
 {
-    char *cs_type = NULL;
+    IRObj *obj = o;
+
     if (argc == 3)
     {
-        if (!strcmp (argv[2], "tcpip"))
-            ((IRObj *)obj)->cs_link = cs_create (tcpip_type, 0);
-        else if (!strcmp (argv[2], "mosi"))
-            ((IRObj *)obj)->cs_link = cs_create (mosi_type, 0);
-        else
-        {
-            interp->result = "wrong comstack type";
+        free (obj->cs_type);
+        if (ir_strdup (interp, &obj->cs_type, argv[2]) == TCL_ERROR)
             return TCL_ERROR;
-        }
     }
-    if (cs_type(((IRObj *)obj)->cs_link) == tcpip_type)
-        cs_type = "tcpip";
-    else if (cs_type(((IRObj *)obj)->cs_link) == mosi_type)
-        cs_type = "comstack";
-    Tcl_AppendResult (interp, cs_type, NULL);
+    Tcl_AppendElement (interp, obj->cs_type);
     return TCL_OK;
 }
 
@@ -522,8 +622,9 @@ static int do_databaseNames (void *obj, Tcl_Interp *interp,
 
     if (argc < 3)
     {
-        interp->result = "wrong # args";
-        return TCL_ERROR;
+        for (i=0; i<p->num_databaseNames; i++)
+            Tcl_AppendElement (interp, p->databaseNames[i]);
+        return TCL_OK;
     }
     if (p->databaseNames)
     {
@@ -561,6 +662,26 @@ static int do_query (void *obj, Tcl_Interp *interp,
     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
  */
@@ -573,14 +694,15 @@ static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
     { 0, "protocolVersion",         do_protocolVersion },
     { 0, "options",                 do_options },
     { 1, "preferredMessageSize",    do_preferredMessageSize },
-    { 1, "maximumMessageSize",      do_maximumMessageSize },
+    { 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, "databaseNames",           do_databaseNames},
+    { 1, "databaseNames",           do_databaseNames},
+    { 1, "replaceIndicator",        do_replaceIndicator},
     { 1, "query",                   do_query },
     { 0, NULL, NULL}
     };
@@ -613,10 +735,13 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     }
     if (!(obj = ir_malloc (interp, sizeof(*obj))))
         return TCL_ERROR;
-    obj->cs_link = cs_create (tcpip_type, 0);
+    if (ir_strdup (interp, &obj->cs_type, "tcpip") == TCL_ERROR)
+        return TCL_ERROR;
+    obj->cs_link = NULL;
 
-    obj->maximumMessageSize = 32768;
+    obj->maximumRecordSize = 32768;
     obj->preferredMessageSize = 4096;
+    obj->connectFlag = 0;
 
     obj->idAuthentication = NULL;
 
@@ -684,8 +809,7 @@ static int do_search (void *o, Tcl_Interp *interp,
     Odr_oct ccl_query;
     IRSetObj *obj = o;
     IRObj *p = obj->parent;
-    char *sbuf;
-    int slen;
+    int r;
 
     p->child = o;
     if (argc != 3)
@@ -707,9 +831,14 @@ static int do_search (void *o, Tcl_Interp *interp,
     req.largeSetLowerBound = &p->largeSetLowerBound;
     req.mediumSetPresentNumber = &p->mediumSetPresentNumber;
     req.replaceIndicator = &p->replaceIndicator;
-    req.resultSetName = "Default";
+    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;
@@ -732,6 +861,7 @@ static int do_search (void *o, Tcl_Interp *interp,
         assert((RPNquery = ccl_rpn_query(rpn)));
         RPNquery->attributeSetId = bib1;
         query.u.type_1 = RPNquery;
+        printf ("- RPN\n");
     }
     else if (!strcmp (p->query_method, "ccl"))
     {
@@ -739,6 +869,7 @@ static int do_search (void *o, Tcl_Interp *interp,
         query.u.type_2 = &ccl_query;
         ccl_query.buf = argv[2];
         ccl_query.len = strlen (argv[2]);
+        printf ("- CCL\n");
     }
     else
     {
@@ -751,13 +882,21 @@ static int do_search (void *o, Tcl_Interp *interp,
         odr_reset (p->odr_out);
         return TCL_ERROR;
     } 
-    sbuf = odr_getbuf (p->odr_out, &slen);
-    if (cs_put (p->cs_link, sbuf, slen) < 0)
+    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;
     }
-    printf ("Search request\n");
+    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;
 }
 
@@ -774,6 +913,37 @@ static int do_resultCount (void *o, Tcl_Interp *interp,
 }
 
 /*
+ * 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,
@@ -843,14 +1013,14 @@ static int get_marc_lines (Tcl_Interp *interp, Iso2709Rec rec,
         for (field = dir->fields; field; field = field->next)
         {
             if (!field->identifier)
-                Tcl_AppendResult (interp, "{{} ", NULL);
+                Tcl_AppendResult (interp, "{{}", NULL);
             else
             {
                 if (argc > 6 && marc_cmp (field->identifier, argv[6]))
                     continue;
-                Tcl_AppendResult (interp, "{", field->identifier, " ", NULL);
+                Tcl_AppendResult (interp, "{", field->identifier, NULL);
             }
-            Tcl_AppendResult (interp, "{", field->data, "}", NULL);
+            Tcl_AppendElement (interp, field->data);
             Tcl_AppendResult (interp, "} ", NULL);
         }
         Tcl_AppendResult (interp, "}} ", NULL);
@@ -874,11 +1044,7 @@ static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
     if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
         return TCL_ERROR;
-    for (rl = obj->record_list; rl; rl = rl->next)
-    {
-        if (rl->no == offset)
-            break;
-    }
+    rl = find_IR_record (obj, offset);
     if (!rl)
         return TCL_OK;
     switch (rl->which)
@@ -889,9 +1055,6 @@ static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
     case Z_NamePlusRecord_surrogateDiagnostic:
         interp->result = "surrogateDiagnostic";
         break;
-    default:
-        interp->result = "unknown";
-        break;
     }
     return TCL_OK;
 }
@@ -913,11 +1076,7 @@ static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
     if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
         return TCL_ERROR;
-    for (rl = obj->record_list; rl; rl = rl->next)
-    {
-        if (rl->no == offset)
-            break;
-    }
+    rl = find_IR_record (obj, offset);
     if (!rl)
     {
         Tcl_AppendResult (interp, "No record at #", argv[2], NULL);
@@ -928,12 +1087,10 @@ static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
         Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
         return TCL_ERROR;
     }
-    sprintf (buf, "%d ", rl->u.diag.code);
-    Tcl_AppendResult (interp, buf, NULL);
-    if (rl->u.diag.add_info)
-        Tcl_AppendElement (interp, rl->u.diag.add_info);
-    else
-        Tcl_AppendElement (interp, "");
+    sprintf (buf, "%d", rl->u.diag.condition);
+    Tcl_AppendResult (interp, buf, " {", 
+                      (rl->u.diag.addinfo ? rl->u.diag.addinfo : ""),
+                      "}", NULL);
     return TCL_OK;
 }
 
@@ -953,9 +1110,7 @@ static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
     if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
         return TCL_ERROR;
-    for (rl = obj->record_list; rl; rl = rl->next)
-        if (rl->no == offset)
-            break;
+    rl = find_IR_record (obj, offset);
     if (!rl)
     {
         Tcl_AppendResult (interp, "No record at #", argv[2], NULL);
@@ -978,6 +1133,41 @@ static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
 }
 
 /*
+ * 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
  */
 
@@ -990,8 +1180,7 @@ static int do_present (void *o, Tcl_Interp *interp,
     Z_PresentRequest req;
     int start;
     int number;
-    char *sbuf;
-    int slen;
+    int r;
 
     if (argc >= 3)
     {
@@ -1027,13 +1216,23 @@ static int do_present (void *o, Tcl_Interp *interp,
         odr_reset (p->odr_out);
         return TCL_ERROR;
     } 
-    sbuf = odr_getbuf (p->odr_out, &slen);
-    if (cs_put (p->cs_link, sbuf, slen) < 0)
+    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;
     }
-    printf ("Present request, start=%d, num=%d\n", start, number);
+    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;
 }
 
@@ -1068,24 +1267,7 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
         rec = iso2709_cvt (buf);
         if (!rec)
             break;
-        for (rl = setobj->record_list; rl; rl = rl->next)
-        {
-            if (no == rl->no)
-            {
-                if (rl->which == Z_NamePlusRecord_databaseRecord)
-                    iso2709_rm (rl->u.marc.rec);
-                break;
-            }
-        }
-        if (!rl)
-        {
-            rl = malloc (sizeof(*rl));
-            assert (rl);
-            rl->next = setobj->record_list;
-            rl->no = no;
-            setobj->record_list = rl;
-        }
-        rl->which = Z_NamePlusRecord_databaseRecord;
+        rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord);
         rl->u.marc.rec = rec;
         no++;
     }
@@ -1103,12 +1285,15 @@ static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
 {
     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}
     };
@@ -1147,8 +1332,9 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
         return TCL_ERROR;
     if (!(obj = ir_malloc (interp, sizeof(*obj))))
         return TCL_ERROR;
-    obj->z_records = NULL;
+    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);
@@ -1157,20 +1343,6 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
 
 /* ------------------------------------------------------- */
 
-static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
-{    
-    IRObj *p = o;
-    IRSetObj *obj = p->child;
-
-    if (obj)
-        obj->resultCount = *searchrs->resultCount;
-    if (searchrs->searchStatus)
-        printf("Search was a success.\n");
-    else
-        printf("Search was a bloomin' failure.\n");
-    printf("Number of hits: %d\n", *searchrs->resultCount);
-}
-
 static void ir_initResponse (void *obj, Z_InitResponse *initrs)
 {
     if (!*initrs->result)
@@ -1183,6 +1355,10 @@ static void ir_initResponse (void *obj, Z_InitResponse *initrs)
         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)
     {
@@ -1193,98 +1369,139 @@ static void ir_initResponse (void *obj, Z_InitResponse *initrs)
 #endif
 }
 
-static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
+static void ir_handleRecords (void *o, Z_Records *zrs)
 {
     IRObj *p = o;
     IRSetObj *setobj = p->child;
-    Z_Records *zrs = presrs->records;
-    setobj->z_records = presrs->records;
-    
-    printf ("Received presentResponse\n");
-    if (zrs)
+
+    setobj->which = zrs->which;
+    setobj->recordFlag = 1;
+    if (zrs->which == Z_Records_NSD)
     {
-        if (zrs->which == Z_Records_NSD)
-        {
-            setobj->numberOfRecordsReturned = 0;
-            printf ("They are diagnostic!!!\n");
-            /*            
-               char buf[16];
-               sprintf (buf, "%d", *zrs->u.nonSurrogateDiagnostic->condition);
-               Tcl_AppendResult (interp, "Diagnostic message: ", buf,
-               " : ",
-               zrs->u.nonSurrogateDiagnostic->addinfo, NULL);
-               return TCL_ERROR;
-               */
-            return;
-        }
-        else
+        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++)
         {
-            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)
             {
-                int no = setobj->start + offset;
+                Z_DiagRec *diagrec;
                 
-                for (rl = setobj->record_list; rl; rl = rl->next)
-                {
-                    if (no == rl->no)
-                    {
-                        if (rl->which == Z_NamePlusRecord_databaseRecord)
-                            iso2709_rm (rl->u.marc.rec);
-                        break;
-                    }
-                }
-                if (!rl)
-                {
-                    rl = malloc (sizeof(*rl));
-                    assert (rl);
-                    rl->next = setobj->record_list;
-                    rl->no = no;
-                    setobj->record_list = rl;
-                }
-                rl->which = zrs->u.databaseOrSurDiagnostics->
-                            records[offset]->which;
-                if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
+                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)
                 {
-                    rl->u.diag.code = 0;
-                    rl->u.diag.add_info = NULL;
+                    const char *buf = (char*) zr->u.octet_aligned->buf;
+                    rl->u.marc.rec = iso2709_cvt (buf);
                 }
                 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;
-                }
+                    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");
     }
 }
 
-void ir_select_proc (ClientData clientData)
+/*
+ * 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;
+        if (r < 0)
+        {
+            printf ("cs_rcvconnect error\n");
+            ir_select_remove_write (cs_fileno (p->cs_link), p);
+            return;
+        }
+        ir_select_remove_write (cs_fileno (p->cs_link), p);
+        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)
@@ -1293,6 +1510,8 @@ void ir_select_proc (ClientData clientData)
             ir_select_remove (cs_fileno (p->cs_link), p);
             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))
@@ -1320,6 +1539,43 @@ void ir_select_proc (ClientData clientData)
     } 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);
+            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);
+    }
+    else if (r == 0)            /* remove select bit */
+    {
+        ir_select_remove_write (cs_fileno (p->cs_link), p);
+    }
+}
+
 /* ------------------------------------------------------- */
 
 /*
@@ -1333,3 +1589,5 @@ int ir_tcl_init (Tcl_Interp *interp)
     		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
+
+