X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=ir-tcl.c;h=6c1c0cb8118ab31e6ed99f25d2f6c0ac139421b1;hb=aa3f048cf3fe92e08f6de03cc10d1affb1c51d29;hp=f9986c9bc4c7a6d2ea696a11a429a78238db66b2;hpb=cfcd8c656d76e9ab317063f14d9db794f34f2931;p=ir-tcl-moved-to-github.git

diff --git a/ir-tcl.c b/ir-tcl.c
index f9986c9..6c1c0cb 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.20  1995-03-29 16:07:09  adam
+ * Revision 1.26  1995-04-18 16:11:51  adam
+ * First version of graphical Scan. Some work on query-by-form.
+ *
+ * Revision 1.25  1995/04/17  09:37:17  adam
+ * Further development of scan.
+ *
+ * Revision 1.24  1995/04/11  14:16:42  adam
+ * Further work on scan. Response works. Entries aren't saved yet.
+ *
+ * Revision 1.23  1995/04/10  10:50:27  adam
+ * Result-set name defaults to suffix of ir-set name.
+ * Started working on scan. Not finished at this point.
+ *
+ * Revision 1.22  1995/03/31  10:43:03  adam
+ * More robust when getting bad MARC records.
+ *
+ * Revision 1.21  1995/03/31  08:56:37  adam
+ * New button "Search".
+ *
+ * Revision 1.20  1995/03/29  16:07:09  adam
  * Bug fix: Didn't use setName in present request.
  *
  * Revision 1.19  1995/03/28  12:45:23  adam
@@ -69,8 +88,10 @@
 #include <sys/time.h>
 #include <assert.h>
 
+#include <tcl.h>
+
 #include <yaz-ccl.h>
-#include <iso2709p.h>
+#include <iso2709.h>
 #include <comstack.h>
 #include <tcpip.h>
 
@@ -80,10 +101,9 @@
 
 #include <odr.h>
 #include <proto.h>
+#include <oid.h>
 #include <diagbib1.h>
 
-#include <tcl.h>
-
 #include "ir-tcl.h"
 
 #define CS_BLOCK 0
@@ -94,7 +114,6 @@ typedef struct {
     int         connectFlag;
     COMSTACK    cs_link;
 
-
     int         preferredMessageSize;
     int         maximumRecordSize;
     Odr_bitmask options;
@@ -131,8 +150,10 @@ typedef struct {
     char       *query_method;
 
     CCL_bibset  bibset;
+    oident      bib1;
 
-    struct IRSetObj_ *child;
+    struct IRSetObj_ *set_child;
+    struct IRScanObj_ *scan_child;
 } IRObj;
 
 typedef struct IRRecordList_ {
@@ -165,6 +186,44 @@ typedef struct IRSetObj_ {
     IRRecordList *record_list;
 } IRSetObj;
 
+typedef struct IRScanEntry_ {
+    int         which;
+    union {
+        struct {
+	    char *buf;
+	    int  globalOccurrences;
+	} term;
+	struct {
+	    int  condition;
+	    char *addinfo;
+	} diag;
+    } u;
+} IRScanEntry;
+
+typedef struct IRScanDiag_ {
+    int         dummy;
+} IRScanDiag;
+
+typedef struct IRScanObj_ {
+    IRObj      *parent;
+    int         stepSize;
+    int         numberOfTermsRequested;
+    int         preferredPositionInResponse;
+
+    int         scanStatus;
+    int         numberOfEntriesReturned;
+    int         positionOfTerm;
+
+    int         entries_flag;
+    int         which;
+
+    int         num_entries;
+    int         num_diagRecs;
+
+    IRScanEntry *entries;
+    IRScanDiag  *nonSurrogateDiagnostics;
+} IRScanObj;
+
 typedef struct {
     int type;
     char *name;
@@ -217,10 +276,53 @@ static IRRecordList *find_IR_record (IRSetObj *setobj, int no)
 }
 
 /*
+ * getsetint: Set/get integer value
+ */
+static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
+{
+    char buf[20];
+    
+    if (argc == 3)
+    {
+        if (Tcl_GetInt (interp, argv[2], val)==TCL_ERROR)
+            return TCL_ERROR;
+    }
+    sprintf (buf, "%d", *val);
+    Tcl_AppendResult (interp, buf, NULL);
+    return TCL_OK;
+}
+
+/*
+ * mk_nonSurrogateDiagnostics: Make Tcl result with diagnostic info
+ */
+static int mk_nonSurrogateDiagnostics (Tcl_Interp *interp, 
+                                       int condition,
+				       const char *addinfo)
+{
+    char buf[20];
+    const char *cp;
+
+    Tcl_AppendElement (interp, "NSD");
+    sprintf (buf, "%d", condition);
+    Tcl_AppendElement (interp, buf);
+    cp = diagbib1_str (condition);
+    if (cp)
+        Tcl_AppendElement (interp, (char*) cp);
+    else
+        Tcl_AppendElement (interp, "");
+    if (addinfo)
+        Tcl_AppendElement (interp, (char*) addinfo);
+    else
+        Tcl_AppendElement (interp, "");
+    return TCL_OK;
+}
+
+/*
  * get_parent_info: Returns information about parent object.
  */
 static int get_parent_info (Tcl_Interp *interp, const char *name,
-			    Tcl_CmdInfo *parent_info)
+			    Tcl_CmdInfo *parent_info,
+			    const char **suffix)
 {
     char parent_name[128];
     const char *csep = strrchr (name, '.');
@@ -231,6 +333,8 @@ static int get_parent_info (Tcl_Interp *interp, const char *name,
         interp->result = "missing .";
         return TCL_ERROR;
     }
+    if (suffix)
+        *suffix = csep+1;
     pos = csep-name;
     if (pos > 127)
         pos = 127;
@@ -303,7 +407,7 @@ int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
 /*
  * ir_strdup: Duplicate string
  */
-int ir_strdup (Tcl_Interp *interp, char** p, char *s)
+int ir_strdup (Tcl_Interp *interp, char** p, const char *s)
 {
     *p = malloc (strlen(s)+1);
     if (!*p)
@@ -340,11 +444,16 @@ void *ir_malloc (Tcl_Interp *interp, size_t size)
 static int do_init_request (void *obj, Tcl_Interp *interp,
 		       int argc, char **argv)
 {
-    Z_APDU apdu, *apdup;
+    Z_APDU apdu, *apdup = &apdu;
     IRObj *p = obj;
     Z_InitRequest req;
     int r;
 
+    if (!p->cs_link)
+    {
+        interp->result = "not connected";
+        return TCL_ERROR;
+    }
     req.referenceId = 0;
     req.options = &p->options;
     req.protocolVersion = &p->protocolVersion;
@@ -359,7 +468,6 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
 
     apdu.u.initRequest = &req;
     apdu.which = Z_APDU_initRequest;
-    apdup = &apdu;
 
     if (!z_APDU (p->odr_out, &apdup, 0))
     {
@@ -372,6 +480,7 @@ static int do_init_request (void *obj, Tcl_Interp *interp,
     if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
     {     
         interp->result = "cs_put failed in init";
+        do_disconnect (p, NULL, 0, NULL);
         return TCL_ERROR;
     }
     else if (r == 1)
@@ -412,16 +521,8 @@ static int do_options (void *obj, Tcl_Interp *interp,
 static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
-    char buf[20];
-    if (argc == 3)
-    {
-        if (Tcl_GetInt (interp, argv[2], 
-                        &((IRObj *)obj)->preferredMessageSize)==TCL_ERROR)
-            return TCL_ERROR;
-    }
-    sprintf (buf, "%d", ((IRObj *)obj)->preferredMessageSize);
-    Tcl_AppendResult (interp, buf, NULL);
-    return TCL_OK;
+    IRObj *p = obj;
+    return get_set_int (&p->preferredMessageSize, interp, argc, argv);
 }
 
 /*
@@ -430,16 +531,8 @@ static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
 static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
                                     int argc, char **argv)
 {
-    char buf[20];
-    if (argc == 3)
-    {
-        if (Tcl_GetInt (interp, argv[2], 
-                        &((IRObj *)obj)->maximumRecordSize)==TCL_ERROR)
-            return TCL_ERROR;
-    }
-    sprintf (buf, "%d", ((IRObj *)obj)->maximumRecordSize);
-    Tcl_AppendResult (interp, buf, NULL);
-    return TCL_OK;
+    IRObj *p = obj;
+    return get_set_int (&p->maximumRecordSize, interp, argc, argv);
 }
 
 
@@ -558,6 +651,7 @@ static int do_connect (void *obj, Tcl_Interp *interp,
         if ((r=cs_connect (p->cs_link, addr)) < 0)
         {
             interp->result = "cs_connect fail";
+            do_disconnect (p, NULL, 0, NULL);
             return TCL_ERROR;
         }
         ir_select_add (cs_fileno (p->cs_link), p);
@@ -573,7 +667,8 @@ static int do_connect (void *obj, Tcl_Interp *interp,
                 Tcl_Eval (p->interp, p->callback);
         }
     }
-    Tcl_AppendElement (interp, p->hostname);
+    if (p->hostname)
+        Tcl_AppendElement (interp, p->hostname);
     return TCL_OK;
 }
 
@@ -589,12 +684,14 @@ static int do_disconnect (void *obj, Tcl_Interp *interp,
     {
         free (p->hostname);
         p->hostname = NULL;
+        ir_select_remove_write (cs_fileno (p->cs_link), p);
         ir_select_remove (cs_fileno (p->cs_link), p);
 
         assert (p->cs_link);
         cs_close (p->cs_link);
         p->cs_link = NULL;
     }
+    assert (!p->cs_link);
     return TCL_OK;
 }
 
@@ -728,17 +825,7 @@ 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;
+    return get_set_int (&p->replaceIndicator, interp, argc, argv);
 }
 
 /* 
@@ -801,6 +888,9 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     if (ir_strdup (interp, &obj->protocol_type, "Z3950") == TCL_ERROR)
         return TCL_ERROR;
     obj->cs_link = NULL;
+    obj->bib1.proto = PROTO_Z3950;
+    obj->bib1.class = CLASS_ATTSET;
+    obj->bib1.value = VAL_BIB1;
 
     obj->maximumRecordSize = 32768;
     obj->preferredMessageSize = 4096;
@@ -820,8 +910,17 @@ static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
     obj->largeSetLowerBound = 2;
     obj->mediumSetPresentNumber = 0;
     obj->replaceIndicator = 1;
+#if 0
     obj->databaseNames = NULL;
     obj->num_databaseNames = 0; 
+#else
+    obj->num_databaseNames = 1;
+    if (!(obj->databaseNames = ir_malloc (interp,
+                                          sizeof(*obj->databaseNames))))
+        return TCL_ERROR;
+    if (ir_strdup (interp, &obj->databaseNames[0], "Default") == TCL_ERROR)
+        return TCL_ERROR;
+#endif
 
     obj->hostname = NULL;
 
@@ -868,14 +967,13 @@ static int do_search (void *o, Tcl_Interp *interp,
 {
     Z_SearchRequest req;
     Z_Query query;
-    Z_APDU apdu, *apdup;
-    static Odr_oid bib1[] = {1, 2, 840, 10003, 3, 1, -1};
+    Z_APDU apdu, *apdup = &apdu;
     Odr_oct ccl_query;
     IRSetObj *obj = o;
     IRObj *p = obj->parent;
     int r;
 
-    p->child = o;
+    p->set_child = o;
     if (argc != 3)
     {
         interp->result = "wrong # args";
@@ -886,9 +984,13 @@ static int do_search (void *o, Tcl_Interp *interp,
         interp->result = "no databaseNames";
         return TCL_ERROR;
     }
+    if (!p->cs_link)
+    {
+        interp->result = "not connected";
+        return TCL_ERROR;
+    }
     apdu.which = Z_APDU_searchRequest;
     apdu.u.searchRequest = &req;
-    apdup = &apdu;
 
     req.referenceId = 0;
     req.smallSetUpperBound = &p->smallSetUpperBound;
@@ -923,7 +1025,7 @@ static int do_search (void *o, Tcl_Interp *interp,
         }
         query.which = Z_Query_type_1;
         assert((RPNquery = ccl_rpn_query(rpn)));
-        RPNquery->attributeSetId = bib1;
+        RPNquery->attributeSetId = oid_getoidbyent (&p->bib1);
         query.u.type_1 = RPNquery;
         printf ("- RPN\n");
     }
@@ -949,7 +1051,7 @@ static int do_search (void *o, Tcl_Interp *interp,
     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";
+        interp->result = "cs_put failed in search";
         return TCL_ERROR;
     }
     else if (r == 1)
@@ -972,8 +1074,7 @@ static int do_resultCount (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
 
-    sprintf (interp->result, "%d", obj->resultCount);
-    return TCL_OK;
+    return get_set_int (&obj->resultCount, interp, argc, argv);
 }
 
 /*
@@ -984,8 +1085,7 @@ static int do_searchStatus (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
 
-    sprintf (interp->result, "%d", obj->searchStatus);
-    return TCL_OK;
+    return get_set_int (&obj->searchStatus, interp, argc, argv);
 }
 
 /*
@@ -1015,80 +1115,69 @@ static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
 {
     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;
+    return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
 }
 
 static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
                            int argc, char **argv)
 {
-    struct iso2709_dir *dir;
-    struct iso2709_field *field;
+    Iso2709Anchor a;
+    char *data;
 
-    for (dir = rec->directory; dir; dir = dir->next)
+    if (!rec)
+        return TCL_OK;
+    a = iso2709_a_mk (rec);
+    while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
     {
-        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);
-        }
+        if (!(iso2709_a_info_field (a, NULL, NULL, NULL, &data)))
+            break;
+        Tcl_AppendElement (interp, data);
+        iso2709_a_next (a);
     }
+
+    iso2709_a_rm (a);
     return TCL_OK;
 }
 
-static int get_marc_lines (Tcl_Interp *interp, Iso2709Rec rec,
-                           int argc, char **argv)
+static int get_marc_lines(Tcl_Interp *interp, Iso2709Rec rec,
+                         int argc, char **argv)
 {
-    struct iso2709_dir *dir;
-    struct iso2709_field *field;
+    Iso2709Anchor a;
+    char *tag;
+    char *indicator;
+    char *identifier;
+    char *data;
+    char *ptag = "";
     
-    for (dir = rec->directory; dir; dir = dir->next)
+    if (!rec)
+        return TCL_OK;
+    a = iso2709_a_mk (rec);
+    while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
     {
-        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 (!(iso2709_a_info_field (a, &tag, &indicator, &identifier, &data)))
+            break;
+        if (strcmp (tag, ptag))
         {
-            if (!field->identifier)
-                Tcl_AppendResult (interp, "{{}", NULL);
+            if (*ptag)
+                Tcl_AppendResult (interp, "}} ", NULL);
+            if (!indicator)
+                Tcl_AppendResult (interp, "{", tag, " {} {", 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, "{", tag, " {", indicator, 
+                                  "} {", NULL);
+            ptag = tag;
         }
-        Tcl_AppendResult (interp, "}} ", NULL);
+        if (!identifier)
+            Tcl_AppendResult (interp, "{{}", NULL);
+        else
+            Tcl_AppendResult (interp, "{", identifier, NULL);
+        Tcl_AppendElement (interp, data);
+        Tcl_AppendResult (interp, "} ", NULL);
+        iso2709_a_next (a);
     }
+    if (*ptag)
+        Tcl_AppendResult (interp, "}} ", NULL);
+    iso2709_a_rm (a);
     return TCL_OK;
 }
 
@@ -1196,6 +1285,7 @@ static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
     }
 }
 
+
 /*
  * do_responseStatus: Return response status (present or search)
  */
@@ -1203,8 +1293,6 @@ 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;
@@ -1214,19 +1302,8 @@ static int do_responseStatus (void *o, Tcl_Interp *interp,
     	Tcl_AppendElement (interp, "DBOSD");
         break;
     case Z_Records_NSD:
-        Tcl_AppendElement (interp, "NSD");
-        sprintf (buf, "%d", obj->condition);
-        Tcl_AppendElement (interp, buf);
-        cp = diagbib1_str (obj->condition);
-        if (cp)
-            Tcl_AppendElement (interp, (char*) cp);
-        else
-            Tcl_AppendElement (interp, "");
-        if (obj->addinfo)
-            Tcl_AppendElement (interp, obj->addinfo);
-        else
-            Tcl_AppendElement (interp, "");
-        break;
+        return mk_nonSurrogateDiagnostics (interp, obj->condition, 
+	                                   obj->addinfo);
     }
     return TCL_OK;
 }
@@ -1240,7 +1317,7 @@ static int do_present (void *o, Tcl_Interp *interp,
 {
     IRSetObj *obj = o;
     IRObj *p = obj->parent;
-    Z_APDU apdu, *apdup;
+    Z_APDU apdu, *apdup = &apdu;
     Z_PresentRequest req;
     int start;
     int number;
@@ -1260,10 +1337,14 @@ static int do_present (void *o, Tcl_Interp *interp,
     }
     else 
         number = 10;
+    if (!p->cs_link)
+    {
+        interp->result = "not connected";
+        return TCL_ERROR;
+    }
     obj->start = start;
     obj->number = number;
 
-    apdup = &apdu;
     apdu.which = Z_APDU_presentRequest;
     apdu.u.presentRequest = &req;
     req.referenceId = 0;
@@ -1285,7 +1366,7 @@ static int do_present (void *o, Tcl_Interp *interp,
     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";
+        interp->result = "cs_put failed in present";
         return TCL_ERROR;
     }
     else if (r == 1)
@@ -1342,7 +1423,6 @@ static int do_loadFile (void *o, Tcl_Interp *interp,
     return TCL_OK;
 }
 
-
 /* 
  * ir_set_obj_method: IR Set Object methods
  */
@@ -1388,17 +1468,19 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
 {
     Tcl_CmdInfo parent_info;
     IRSetObj *obj;
+    const char *suffix;
 
     if (argc != 2)
     {
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
-    if (get_parent_info (interp, argv[1], &parent_info) == TCL_ERROR)
+    if (get_parent_info (interp, argv[1], &parent_info, &suffix) == TCL_ERROR)
         return TCL_ERROR;
     if (!(obj = ir_malloc (interp, sizeof(*obj))))
         return TCL_ERROR;
-    obj->setName = NULL;
+    if (ir_strdup (interp, &obj->setName, suffix) == TCL_ERROR)
+        return TCL_ERROR;
     obj->record_list = NULL;
     obj->addinfo = NULL;
     obj->parent = (IRObj *) parent_info.clientData;
@@ -1409,6 +1491,258 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
 
 /* ------------------------------------------------------- */
 
+/*
+ * do_scan: Perform scan 
+ */
+static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
+{
+    Z_ScanRequest req;
+    Z_APDU apdu, *apdup = &apdu;
+    IRScanObj *obj = o;
+    IRObj *p = obj->parent;
+    int r;
+
+    p->scan_child = o;
+    if (argc != 3)
+    {
+        interp->result = "wrong # args";
+        return TCL_ERROR;
+    }
+    if (!p->num_databaseNames)
+    {
+        interp->result = "no databaseNames";
+	return TCL_ERROR;
+    }
+    if (!p->cs_link)
+    {
+        interp->result = "not connected";
+	return TCL_ERROR;
+    }
+    apdu.which = Z_APDU_scanRequest;
+    apdu.u.scanRequest = &req;
+    req.referenceId = NULL;
+    req.num_databaseNames = p->num_databaseNames;
+    req.databaseNames = p->databaseNames;
+    req.attributeSet = oid_getoidbyent (&p->bib1);
+
+    if (!(req.termListAndStartPoint =
+          ir_malloc (interp, sizeof(*req.termListAndStartPoint))))
+        return TCL_ERROR;
+    req.termListAndStartPoint->num_attributes = 0;
+    req.termListAndStartPoint->attributeList = NULL;
+    if (!(req.termListAndStartPoint->term = ir_malloc (interp,
+                                                       sizeof(Z_Term))))
+        return TCL_ERROR;
+    req.termListAndStartPoint->term->which = Z_Term_general;
+    if (!(req.termListAndStartPoint->term->u.general = 
+        ir_malloc (interp, sizeof(*req.termListAndStartPoint->
+                                  term->u.general))))
+        return TCL_ERROR;
+    if (ir_strdup (interp, &req.termListAndStartPoint->term->u.general->buf,
+                   argv[2]) == TCL_ERROR)
+        return TCL_ERROR;
+    req.termListAndStartPoint->term->u.general->len = 
+        req.termListAndStartPoint->term->u.general->size = strlen(argv[2]);
+    req.stepSize = &obj->stepSize;
+    req.numberOfTermsRequested = &obj->numberOfTermsRequested;
+    req.preferredPositionInResponse = &obj->preferredPositionInResponse;
+    printf ("stepSize=%d\n", *req.stepSize);
+    printf ("numberOfTermsRequested=%d\n", *req.numberOfTermsRequested);
+    printf ("preferredPositionInResponse=%d\n",
+            *req.preferredPositionInResponse);
+
+    if (!z_APDU (p->odr_out, &apdup, 0))
+    {
+        interp->result = odr_errlist [odr_geterror (p->odr_out)];
+        odr_reset (p->odr_out);
+        return TCL_ERROR;
+    } 
+    p->sbuf = odr_getbuf (p->odr_out, &p->slen);
+    if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
+    {
+        interp->result = "cs_put failed in scan";
+        return TCL_ERROR;
+    }
+    else if (r == 1)
+    {
+        ir_select_add_write (cs_fileno(p->cs_link), p);
+        printf("Sent part of scanRequest (%d bytes).\n", p->slen);
+    }
+    else
+    {
+        printf ("Whole scan request\n");
+    }
+    return TCL_OK;
+}
+
+/*
+ * do_stepSize: Set/get replace Step Size
+ */
+static int do_stepSize (void *obj, Tcl_Interp *interp,
+                        int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->stepSize, interp, argc, argv);
+}
+
+/*
+ * do_numberOfTermsRequested: Set/get Number of Terms requested
+ */
+static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,
+                                      int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
+}
+
+
+/*
+ * do_preferredPositionInResponse: Set/get preferred Position
+ */
+static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,
+                                           int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);
+}
+
+/*
+ * do_scanStatus: Get scan status
+ */
+static int do_scanStatus (void *obj, Tcl_Interp *interp,
+                          int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->scanStatus, interp, argc, argv);
+}
+
+/*
+ * do_numberOfEntriesReturned: Get number of Entries returned
+ */
+static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,
+                                       int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);
+}
+
+/*
+ * do_positionOfTerm: Get position of Term
+ */
+static int do_positionOfTerm (void *obj, Tcl_Interp *interp,
+                              int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    return get_set_int (&p->positionOfTerm, interp, argc, argv);
+}
+
+/*
+ * do_scanLine: get Scan Line (surrogate or normal) after response
+ */
+static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
+{
+    IRScanObj *p = obj;
+    int i;
+    char numstr[20];
+
+    if (argc != 3)
+    {
+        interp->result = "wrong # args";
+	return TCL_ERROR;
+    }
+    if (Tcl_GetInt (interp, argv[2], &i) == TCL_ERROR)
+        return TCL_ERROR;
+    if (!p->entries_flag || p->which != Z_ListEntries_entries || !p->entries
+        || i >= p->num_entries || i < 0)
+        return TCL_OK;
+    switch (p->entries[i].which)
+    {
+    case Z_Entry_termInfo:
+        Tcl_AppendElement (interp, "T");
+	if (p->entries[i].u.term.buf)
+	    Tcl_AppendElement (interp, p->entries[i].u.term.buf);
+	else
+	    Tcl_AppendElement (interp, "");
+	sprintf (numstr, "%d", p->entries[i].u.term.globalOccurrences);
+	Tcl_AppendElement (interp, numstr);
+	break;
+    case Z_Entry_surrogateDiagnostic:
+        return 
+	    mk_nonSurrogateDiagnostics (interp, p->entries[i].u.diag.condition,
+	                                p->entries[i].u.diag.addinfo);
+	break;
+    }
+    return TCL_OK;
+}
+
+/* 
+ * ir_scan_obj_method: IR Scan Object methods
+ */
+static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
+                               int argc, char **argv)
+{
+    static IRMethod tab[] = {
+    { 0, "scan",                    do_scan },
+    { 0, "stepSize",                do_stepSize },
+    { 0, "numberOfTermsRequested",  do_numberOfTermsRequested },
+    { 0, "preferredPositionInResponse", do_preferredPositionInResponse },
+    { 0, "scanStatus",              do_scanStatus },
+    { 0, "numberOfEntriesReturned", do_numberOfEntriesReturned },
+    { 0, "positionOfTerm",          do_positionOfTerm },
+    { 0, "scanLine",                do_scanLine },
+    { 0, NULL, NULL}
+    };
+
+    if (argc < 2)
+    {
+        interp->result = "wrong # args";
+        return TCL_ERROR;
+    }
+    return ir_method (clientData, interp, argc, argv, tab);
+}
+
+/* 
+ * ir_scan_obj_delete: IR Scan Object disposal
+ */
+static void ir_scan_obj_delete (ClientData clientData)
+{
+    free ( (void*) clientData);
+}
+
+/* 
+ * ir_scan_obj_mk: IR Scan Object creation
+ */
+static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
+                           int argc, char **argv)
+{
+    Tcl_CmdInfo parent_info;
+    IRScanObj *obj;
+
+    if (argc != 2)
+    {
+        interp->result = "wrong # args";
+        return TCL_ERROR;
+    }
+    if (get_parent_info (interp, argv[1], &parent_info, NULL) == TCL_ERROR)
+        return TCL_ERROR;
+    if (!(obj = ir_malloc (interp, sizeof(*obj))))
+        return TCL_ERROR;
+
+    obj->stepSize = 0;
+    obj->numberOfTermsRequested = 20;
+    obj->preferredPositionInResponse = 1;
+
+    obj->entries = NULL;
+    obj->nonSurrogateDiagnostics = NULL;
+
+    obj->parent = (IRObj *) parent_info.clientData;
+    Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,
+                       (ClientData) obj, ir_scan_obj_delete);
+    return TCL_OK;
+}
+
+/* ------------------------------------------------------- */
+
 static void ir_initResponse (void *obj, Z_InitResponse *initrs)
 {
     if (!*initrs->result)
@@ -1438,7 +1772,7 @@ static void ir_initResponse (void *obj, Z_InitResponse *initrs)
 static void ir_handleRecords (void *o, Z_Records *zrs)
 {
     IRObj *p = o;
-    IRSetObj *setobj = p->child;
+    IRSetObj *setobj = p->set_child;
 
     setobj->which = zrs->which;
     setobj->recordFlag = 1;
@@ -1507,7 +1841,7 @@ static void ir_handleRecords (void *o, Z_Records *zrs)
 static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
 {    
     IRObj *p = o;
-    IRSetObj *setobj = p->child;
+    IRSetObj *setobj = p->set_child;
     Z_Records *zrs = searchrs->records;
 
     if (setobj)
@@ -1529,7 +1863,7 @@ static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
 static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
 {
     IRObj *p = o;
-    IRSetObj *setobj = p->child;
+    IRSetObj *setobj = p->set_child;
     Z_Records *zrs = presrs->records;
     
     printf ("Received presentResponse\n");
@@ -1542,6 +1876,95 @@ static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
     }
 }
 
+static void ir_scanResponse (void *o, Z_ScanResponse *scanrs)
+{
+    IRObj *p = o;
+    IRScanObj *scanobj = p->scan_child;
+    
+    printf ("Received scanResponse\n");
+
+    scanobj->scanStatus = *scanrs->scanStatus;
+    printf ("scanStatus=%d\n", scanobj->scanStatus);
+
+    if (scanrs->stepSize)
+        scanobj->stepSize = *scanrs->stepSize;
+    printf ("stepSize=%d\n", scanobj->stepSize);
+
+    scanobj->numberOfEntriesReturned = *scanrs->numberOfEntriesReturned;
+    printf ("numberOfEntriesReturned=%d\n", scanobj->numberOfEntriesReturned);
+
+    if (scanrs->positionOfTerm)
+        scanobj->positionOfTerm = *scanrs->positionOfTerm;
+    else
+        scanobj->positionOfTerm = -1;
+    printf ("positionOfTerm=%d\n", scanobj->positionOfTerm);
+
+    free (scanobj->entries);
+    scanobj->entries = NULL;
+    free (scanobj->nonSurrogateDiagnostics);
+    scanobj->nonSurrogateDiagnostics = NULL;
+
+    if (scanrs->entries)
+    {
+        int i;
+	Z_Entry *ze;
+
+        scanobj->entries_flag = 1;
+        scanobj->which = scanrs->entries->which;
+	switch (scanobj->which)
+	{
+	case Z_ListEntries_entries:
+	    scanobj->num_entries = scanrs->entries->u.entries->num_entries;
+	    scanobj->entries = malloc (scanobj->num_entries * 
+	                               sizeof(*scanobj->entries));
+            for (i=0; i<scanobj->num_entries; i++)
+	    {
+	        ze = scanrs->entries->u.entries->entries[i];
+                scanobj->entries[i].which = ze->which;
+		switch (ze->which)
+		{
+		case Z_Entry_termInfo:
+		    if (ze->u.termInfo->term->which == Z_Term_general)
+		    {
+                        int l = ze->u.termInfo->term->u.general->len;
+                        scanobj->entries[i].u.term.buf = malloc (1+l);
+			memcpy (scanobj->entries[i].u.term.buf, 
+			        ze->u.termInfo->term->u.general->buf,
+                                l);
+                        scanobj->entries[i].u.term.buf[l] = '\0';
+		    }
+		    else
+                        scanobj->entries[i].u.term.buf = NULL;
+		    if (ze->u.termInfo->globalOccurrences)
+		        scanobj->entries[i].u.term.globalOccurrences = 
+		            *ze->u.termInfo->globalOccurrences;
+		    else
+		        scanobj->entries[i].u.term.globalOccurrences = 0;
+                    break;
+		case Z_Entry_surrogateDiagnostic:
+		    scanobj->entries[i].u.diag.addinfo = 
+		            malloc (1+strlen(ze->u.surrogateDiagnostic->
+			                     addinfo));
+                    strcpy (scanobj->entries[i].u.diag.addinfo,
+		            ze->u.surrogateDiagnostic->addinfo);
+		    scanobj->entries[i].u.diag.condition = 
+		        *ze->u.surrogateDiagnostic->condition;
+		    break;
+		}
+	    }
+            break;
+	case Z_ListEntries_nonSurrogateDiagnostics:
+	    scanobj->num_diagRecs = scanrs->entries->
+	                          u.nonSurrogateDiagnostics->num_diagRecs;
+	    scanobj->nonSurrogateDiagnostics = malloc (scanobj->num_diagRecs *
+	                          sizeof(*scanobj->nonSurrogateDiagnostics));
+            break;
+	}
+    }
+    else
+        scanobj->entries_flag = 0;
+}
+
 /*
  * ir_select_read: handle incoming packages
  */
@@ -1563,6 +1986,7 @@ void ir_select_read (ClientData clientData)
             printf ("cs_rcvconnect error\n");
             if (p->failback)
                 Tcl_Eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 0, NULL);
             return;
         }
         if (p->callback)
@@ -1577,6 +2001,7 @@ void ir_select_read (ClientData clientData)
             ir_select_remove (cs_fileno (p->cs_link), p);
             if (p->failback)
                 Tcl_Eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 0, NULL);
             return;
         }        
         if (r == 1)
@@ -1588,6 +2013,7 @@ void ir_select_read (ClientData clientData)
             printf ("%s\n", odr_errlist [odr_geterror (p->odr_in)]);
             if (p->failback)
                 Tcl_Eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 0, NULL);
             return;
         }
         switch(apdu->which)
@@ -1601,11 +2027,15 @@ void ir_select_read (ClientData clientData)
         case Z_APDU_presentResponse:
             ir_presentResponse (p, apdu->u.presentResponse);
             break;
+        case Z_APDU_scanResponse:
+            ir_scanResponse (p, apdu->u.scanResponse);
+            break;
         default:
             printf("Received unknown APDU type (%d).\n", 
                    apdu->which);
             if (p->failback)
                 Tcl_Eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 0, NULL);
         }
         if (p->callback)
 	    Tcl_Eval (p->interp, p->callback);
@@ -1633,6 +2063,7 @@ void ir_select_write (ClientData clientData)
             ir_select_remove_write (cs_fileno (p->cs_link), p);
             if (p->failback)
                 Tcl_Eval (p->interp, p->failback);
+            do_disconnect (p, NULL, 0, NULL);
             return;
         }
         ir_select_remove_write (cs_fileno (p->cs_link), p);
@@ -1643,9 +2074,9 @@ void ir_select_write (ClientData clientData)
     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);
+        do_disconnect (p, NULL, 0, NULL);
     }
     else if (r == 0)            /* remove select bit */
     {
@@ -1664,6 +2095,8 @@ int ir_tcl_init (Tcl_Interp *interp)
                        (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand (interp, "ir-set", ir_set_obj_mk,
     		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateCommand (interp, "ir-scan", ir_scan_obj_mk,
+    		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }