/*
* IR toolkit for tcl/tk
* (c) Index Data 1995
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.28 1995-05-23 15:34:48 adam
+ * Revision 1.34 1995-05-29 10:33:42 adam
+ * README and rename of startup script.
+ *
+ * Revision 1.33 1995/05/29 09:15:11 quinn
+ * Changed CS_SR to PROTO_SR, etc.
+ *
+ * Revision 1.32 1995/05/29 08:44:16 adam
+ * Work on delete of objects.
+ *
+ * Revision 1.31 1995/05/26 11:44:10 adam
+ * Bugs fixed. More work on MARC utilities and queries. Test
+ * client is up-to-date again.
+ *
+ * Revision 1.30 1995/05/26 08:54:11 adam
+ * New MARC utilities. Uses prefix query.
+ *
+ * Revision 1.29 1995/05/24 14:10:22 adam
+ * Work on idAuthentication, protocolVersion and options.
+ *
+ * Revision 1.28 1995/05/23 15:34:48 adam
* Many new settings, userInformationField, smallSetUpperBound, etc.
* A number of settings are inherited when ir-set is executed.
* This version is incompatible with the graphical test client (client.tcl).
int (*method) (void *obj, Tcl_Interp *interp, int argc, char **argv);
} IRMethod;
+typedef struct {
+ void *obj;
+ IRMethod *tab;
+} IRMethods;
static int do_disconnect (void *obj,Tcl_Interp *interp, int argc, char **argv);
switch (rl->which)
{
case Z_NamePlusRecord_databaseRecord:
- iso2709_rm (rl->u.marc.rec);
+ free (rl->u.dbrec.buf);
+ rl->u.dbrec.buf = NULL;
break;
case Z_NamePlusRecord_surrogateDiagnostic:
free (rl->u.diag.addinfo);
return NULL;
}
+static void delete_IR_records (IRSetObj *setobj)
+{
+ IRRecordList *rl, *rl1;
+
+ for (rl = setobj->record_list; rl; rl = rl1)
+ {
+ switch (rl->which)
+ {
+ case Z_NamePlusRecord_databaseRecord:
+ free (rl->u.dbrec.buf);
+ break;
+ case Z_NamePlusRecord_surrogateDiagnostic:
+ free (rl->u.diag.addinfo);
+ break;
+ }
+ rl1 = rl->next;
+ free (rl);
+ }
+ setobj->record_list = NULL;
+}
+
/*
* getsetint: Set/get integer value
*/
/*
* 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, int sigerr)
+int ir_method (Tcl_Interp *interp, int argc, char **argv, IRMethods *tab)
{
+ IRMethods *tab_i = tab;
IRMethod *t;
- for (t = tab; t->name; t++)
- if (!strcmp (t->name, argv[1]))
- return (*t->method)(obj, interp, argc, argv);
- if (sigerr)
- return TCL_ERROR;
- Tcl_AppendResult (interp, "Bad method. Possible values:", NULL);
- for (t = tab; t->name; t++)
- Tcl_AppendResult (interp, " ", t->name, NULL);
+
+ for (tab_i = tab; tab_i->tab; tab_i++)
+ for (t = tab_i->tab; t->name; t++)
+ if (argc <= 0)
+ {
+ if ((*t->method)(tab_i->obj, interp, argc, argv) == TCL_ERROR)
+ return TCL_ERROR;
+ }
+ else
+ if (!strcmp (t->name, argv[1]))
+ return (*t->method)(tab_i->obj, interp, argc, argv);
+
+ if (argc <= 0)
+ return TCL_OK;
+ Tcl_AppendResult (interp, "Bad method. Possible methods:", NULL);
+ for (tab_i = tab; tab_i->tab; tab_i++)
+ for (t = tab_i->tab; t->name; t++)
+ Tcl_AppendResult (interp, " ", t->name, NULL);
return TCL_ERROR;
}
}
/*
- * ir_asc2bitmask: Ascii to ODR bitmask conversion
+ * ir_named_bits: get/set named bits
*/
-int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
+int ir_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob,
+ Tcl_Interp *interp, int argc, char **argv)
{
- const char *cp = asc + strlen(asc);
- int bitno = 0;
-
- ODR_MASK_ZERO (ob);
- do
+ struct ir_named_entry *ti;
+ if (argc > 0)
{
- if (*--cp == '1')
- ODR_MASK_SET (ob, bitno);
- bitno++;
- } while (cp != asc);
- return bitno;
+ int no;
+ ODR_MASK_ZERO (ob);
+ for (no = 0; no < argc; no++)
+ {
+ for (ti = tab; ti->name; ti++)
+ if (!strcmp (argv[no], ti->name))
+ {
+ ODR_MASK_SET (ob, ti->pos);
+ break;
+ }
+ if (!ti->name)
+ {
+ Tcl_AppendResult (interp, "Bad bit mask: ", argv[no], NULL);
+ return TCL_ERROR;
+ }
+ }
+ return TCL_OK;
+ }
+ for (ti = tab; ti->name; ti++)
+ if (ODR_MASK_GET (ob, ti->pos))
+ Tcl_AppendElement (interp, ti->name);
+ return TCL_OK;
}
/*
}
/*
+ * ir_strdel: Delete string
+ */
+int ir_strdel (Tcl_Interp *interp, char **p)
+{
+ free (*p);
+ *p = NULL;
+ return TCL_OK;
+}
+
+/*
* ir_malloc: Malloc function
*/
void *ir_malloc (Tcl_Interp *interp, size_t size)
Z_InitRequest req;
int r;
+ if (argc <= 0)
+ return TCL_OK;
if (!p->cs_link)
{
interp->result = "not connected";
return TCL_ERROR;
}
+ odr_reset (p->odr_out);
+
req.referenceId = 0;
req.options = &p->options;
req.protocolVersion = &p->protocolVersion;
req.preferredMessageSize = &p->preferredMessageSize;
req.maximumRecordSize = &p->maximumRecordSize;
- req.idAuthentication = p->idAuthentication;
+ if (p->idAuthenticationGroupId)
+ {
+ Z_IdPass *pass = odr_malloc (p->odr_out, sizeof(*pass));
+ Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
+
+ auth->which = Z_IdAuthentication_idPass;
+ auth->u.idPass = pass;
+ if (p->idAuthenticationGroupId && *p->idAuthenticationGroupId)
+ pass->groupId = p->idAuthenticationGroupId;
+ else
+ pass->groupId = NULL;
+ if (p->idAuthenticationUserId && *p->idAuthenticationUserId)
+ pass->userId = p->idAuthenticationUserId;
+ else
+ pass->userId = NULL;
+ if (p->idAuthenticationPassword && *p->idAuthenticationPassword)
+ pass->password = p->idAuthenticationPassword;
+ else
+ pass->password = NULL;
+ req.idAuthentication = auth;
+ }
+ else if (!p->idAuthenticationOpen || !*p->idAuthenticationOpen)
+ req.idAuthentication = NULL;
+ else
+ {
+ Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
+
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = p->idAuthenticationOpen;
+ req.idAuthentication = auth;
+ }
req.implementationId = p->implementationId;
req.implementationName = p->implementationName;
req.implementationVersion = "0.1";
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);
+ do_disconnect (p, NULL, 2, NULL);
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);
+ logf (LOG_DEBUG, "Sent part of initializeRequest (%d bytes)", p->slen);
}
else
- printf("Sent whole initializeRequest (%d bytes).\n", p->slen);
+ logf (LOG_DEBUG, "Sent whole initializeRequest (%d bytes)", p->slen);
return TCL_OK;
}
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;
+ static struct ir_named_entry version_tab[] = {
+ { "1", 0 },
+ { "2", 1 },
+ { "3", 2 },
+ { "4", 3 },
+ { NULL,0}
+ };
+ IRObj *p = obj;
+
+ if (argc <= 0)
+ {
+ ODR_MASK_ZERO (&p->protocolVersion);
+ ODR_MASK_SET (&p->protocolVersion, 0);
+ ODR_MASK_SET (&p->protocolVersion, 1);
+ return TCL_OK;
+ }
+ return ir_named_bits (version_tab, &p->protocolVersion,
+ interp, argc-2, argv+2);
}
/*
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;
+ static struct ir_named_entry options_tab[] = {
+ { "search", 0 },
+ { "present", 1 },
+ { "delSet", 2 },
+ { "resourceReport", 3 },
+ { "triggerResourceCtrl", 4},
+ { "resourceCtrl", 5},
+ { "accessCtrl", 6},
+ { "scan", 7},
+ { "sort", 8},
+ { "extentedServices", 10},
+ { "level-1Segmentation", 11},
+ { "level-2Segmentation", 12},
+ { "concurrentOperations", 13},
+ { "namedResultSets", 14},
+ { NULL, 0}
+ };
+ IRObj *p = obj;
+
+ if (argc <= 0)
+ {
+ ODR_MASK_ZERO (&p->options);
+ ODR_MASK_SET (&p->options, 0);
+ ODR_MASK_SET (&p->options, 1);
+ ODR_MASK_SET (&p->options, 7);
+ ODR_MASK_SET (&p->options, 14);
+ return TCL_OK;
+ }
+ return ir_named_bits (options_tab, &p->options, interp, argc-2, argv+2);
}
/*
int argc, char **argv)
{
IRObj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->preferredMessageSize = 4096;
+ return TCL_OK;
+ }
return get_set_int (&p->preferredMessageSize, interp, argc, argv);
}
int argc, char **argv)
{
IRObj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->maximumRecordSize = 32768;
+ return TCL_OK;
+ }
return get_set_int (&p->maximumRecordSize, interp, argc, argv);
}
/*
* do_initResult: Get init result
*/
-static int do_initResult (void *o, Tcl_Interp *interp,
+static int do_initResult (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *obj = o;
-
- return get_set_int (&obj->initResult, interp, argc, argv);
+ IRObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
+ return get_set_int (&p->initResult, interp, argc, argv);
}
{
IRObj *p = obj;
+ if (argc == 0)
+ return ir_strdup (interp, &p->implementationName, "TCL/TK on YAZ");
+ else if (argc == -1)
+ return ir_strdel (interp, &p->implementationName);
if (argc == 3)
{
- free (((IRObj*)obj)->implementationName);
+ free (p->implementationName);
if (ir_strdup (interp, &p->implementationName, argv[2])
== TCL_ERROR)
return TCL_ERROR;
static int do_implementationId (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
+ IRObj *p = obj;
+
+ if (argc == 0)
+ return ir_strdup (interp, &p->implementationId, "81");
+ else if (argc == -1)
+ return ir_strdel (interp, &p->implementationId);
if (argc == 3)
{
- free (((IRObj*)obj)->implementationId);
- if (ir_strdup (interp, &((IRObj*) obj)->implementationId, argv[2])
- == TCL_ERROR)
+ free (p->implementationId);
+ if (ir_strdup (interp, &p->implementationId, argv[2]) == TCL_ERROR)
return TCL_ERROR;
}
- Tcl_AppendResult (interp, ((IRObj*)obj)->implementationId,
- (char*) NULL);
+ Tcl_AppendResult (interp, p->implementationId, (char*) NULL);
return TCL_OK;
}
{
IRObj *p = obj;
+ if (argc == 0)
+ {
+ p->targetImplementationName = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &p->targetImplementationName);
Tcl_AppendResult (interp, p->targetImplementationName,
(char*) NULL);
return TCL_OK;
static int do_targetImplementationId (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- Tcl_AppendResult (interp, ((IRObj*)obj)->targetImplementationId,
- (char*) NULL);
+ IRObj *p = obj;
+
+ if (argc == 0)
+ {
+ p->targetImplementationId = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &p->targetImplementationId);
+ Tcl_AppendResult (interp, p->targetImplementationId, (char*) NULL);
return TCL_OK;
}
static int do_targetImplementationVersion (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- Tcl_AppendResult (interp, ((IRObj*)obj)->targetImplementationVersion,
- (char*) NULL);
+ IRObj *p = obj;
+
+ if (argc == 0)
+ {
+ p->targetImplementationVersion = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &p->targetImplementationVersion);
+ Tcl_AppendResult (interp, p->targetImplementationVersion, (char*) NULL);
return TCL_OK;
}
static int do_idAuthentication (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- if (argc == 3)
+ IRObj *p = obj;
+
+ if (argc >= 3 || argc == -1)
{
- free (((IRObj*)obj)->idAuthentication);
- if (ir_strdup (interp, &((IRObj*) obj)->idAuthentication, argv[2])
- == TCL_ERROR)
- return TCL_ERROR;
+ free (p->idAuthenticationOpen);
+ free (p->idAuthenticationGroupId);
+ free (p->idAuthenticationUserId);
+ free (p->idAuthenticationPassword);
+ }
+ if (argc >= 3 || argc <= 0)
+ {
+ p->idAuthenticationOpen = NULL;
+ p->idAuthenticationGroupId = NULL;
+ p->idAuthenticationUserId = NULL;
+ p->idAuthenticationPassword = NULL;
+ }
+ if (argc <= 0)
+ return TCL_OK;
+ if (argc >= 3)
+ {
+ if (argc == 3)
+ {
+ if (ir_strdup (interp, &p->idAuthenticationOpen, argv[2])
+ == TCL_ERROR)
+ return TCL_ERROR;
+ }
+ else if (argc == 5)
+ {
+ if (ir_strdup (interp, &p->idAuthenticationGroupId, argv[2])
+ == TCL_ERROR)
+ return TCL_ERROR;
+ if (ir_strdup (interp, &p->idAuthenticationUserId, argv[3])
+ == TCL_ERROR)
+ return TCL_ERROR;
+ if (ir_strdup (interp, &p->idAuthenticationPassword, argv[4])
+ == TCL_ERROR)
+ return TCL_ERROR;
+ }
+ }
+ if (p->idAuthenticationOpen)
+ Tcl_AppendElement (interp, p->idAuthenticationOpen);
+ else if (p->idAuthenticationGroupId)
+ {
+ Tcl_AppendElement (interp, p->idAuthenticationGroupId);
+ Tcl_AppendElement (interp, p->idAuthenticationUserId);
+ Tcl_AppendElement (interp, p->idAuthenticationPassword);
}
- Tcl_AppendResult (interp, ((IRObj*)obj)->idAuthentication,
- (char*) NULL);
return TCL_OK;
}
void *addr;
IRObj *p = obj;
int r;
- int protocol_type = CS_Z3950;
+ int protocol_type = PROTO_Z3950;
+ if (argc <= 0)
+ return TCL_OK;
if (argc == 3)
{
if (p->hostname)
return TCL_ERROR;
}
if (!strcmp (p->protocol_type, "Z3950"))
- protocol_type = CS_Z3950;
+ protocol_type = PROTO_Z3950;
else if (!strcmp (p->protocol_type, "SR"))
- protocol_type = CS_SR;
+ protocol_type = PROTO_SR;
else
{
interp->result = "bad protocol type";
interp->result = "tcpip_strtoaddr fail";
return TCL_ERROR;
}
- printf ("tcp/ip connect %s\n", argv[2]);
+ logf (LOG_DEBUG, "tcp/ip connect %s", argv[2]);
}
#if MOSI
else if (!strcmp (p->cs_type, "mosi"))
interp->result = "mosi_strtoaddr fail";
return TCL_ERROR;
}
- printf ("mosi connect %s\n", argv[2]);
+ logf (LOG_DEBUG, "mosi connect %s", argv[2]);
}
#endif
else
if ((r=cs_connect (p->cs_link, addr)) < 0)
{
interp->result = "cs_connect fail";
- do_disconnect (p, NULL, 0, NULL);
+ do_disconnect (p, NULL, 2, NULL);
return TCL_ERROR;
}
ir_select_add (cs_fileno (p->cs_link), p);
{
IRObj *p = obj;
+ if (argc == 0)
+ {
+ p->connectFlag = 0;
+ p->hostname = NULL;
+ p->cs_link = NULL;
+ return TCL_OK;
+ }
if (p->hostname)
{
free (p->hostname);
{
IRObj *obj = o;
- if (argc == 3)
+ if (argc == 0)
+ return ir_strdup (interp, &obj->cs_type, "tcpip");
+ else if (argc == -1)
+ return ir_strdel (interp, &obj->cs_type);
+ else if (argc == 3)
{
free (obj->cs_type);
if (ir_strdup (interp, &obj->cs_type, argv[2]) == TCL_ERROR)
{
IRObj *obj = o;
- if (argc == 3)
+ if (argc == 0)
+ return ir_strdup (interp, &obj->protocol_type, "Z3950");
+ else if (argc == -1)
+ return ir_strdel (interp, &obj->protocol_type);
+ else if (argc == 3)
{
free (obj->protocol_type);
if (ir_strdup (interp, &obj->protocol_type, argv[2]) == TCL_ERROR)
{
IRObj *p = obj;
+ if (argc == 0)
+ {
+ p->callback = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &p->callback);
if (argc == 3)
{
free (p->callback);
- if (ir_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)
- return TCL_ERROR;
+ if (argv[2][0])
+ {
+ if (ir_strdup (interp, &p->callback, argv[2]) == TCL_ERROR)
+ return TCL_ERROR;
+ }
+ else
+ p->callback = NULL;
p->interp = interp;
}
return TCL_OK;
{
IRObj *p = obj;
- if (argc == 3)
+ if (argc == 0)
+ {
+ p->failback = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &p->failback);
+ else if (argc == 3)
{
free (p->failback);
- if (ir_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
- return TCL_ERROR;
+ if (argv[2][0])
+ {
+ if (ir_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
+ return TCL_ERROR;
+ }
+ else
+ p->failback = NULL;
p->interp = interp;
}
return TCL_OK;
int i;
IRSetCObj *p = obj;
+ if (argc == -1)
+ {
+ for (i=0; i<p->num_databaseNames; i++)
+ free (p->databaseNames[i]);
+ free (p->databaseNames);
+ }
+ if (argc <= 0)
+ {
+ p->num_databaseNames = 0;
+ p->databaseNames = NULL;
+ return TCL_OK;
+ }
if (argc < 3)
{
for (i=0; i<p->num_databaseNames; i++)
{
IRSetCObj *p = obj;
+ if (argc <= 0)
+ {
+ p->replaceIndicator = 1;
+ return TCL_OK;
+ }
return get_set_int (&p->replaceIndicator, interp, argc, argv);
}
{
IRSetCObj *p = obj;
+ if (argc == 0)
+ return ir_strdup (interp, &p->queryType, "rpn");
+ else if (argc == -1)
+ return ir_strdel (interp, &p->queryType);
if (argc == 3)
{
free (p->queryType);
int argc, char **argv)
{
IRObj *p = obj;
-
+
+ if (argc == 0)
+ {
+ p->userInformationField = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &p->userInformationField);
Tcl_AppendResult (interp, p->userInformationField, NULL);
return TCL_OK;
}
static int do_smallSetUpperBound (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetCObj *obj = o;
+ IRSetCObj *p = o;
- return get_set_int (&obj->smallSetUpperBound, interp, argc, argv);
+ if (argc <= 0)
+ {
+ p->smallSetUpperBound = 0;
+ return TCL_OK;
+ }
+ return get_set_int (&p->smallSetUpperBound, interp, argc, argv);
}
/*
static int do_largeSetLowerBound (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetCObj *obj = o;
+ IRSetCObj *p = o;
- return get_set_int (&obj->largeSetLowerBound, interp, argc, argv);
+ if (argc <= 0)
+ {
+ p->largeSetLowerBound = 2;
+ return TCL_OK;
+ }
+ return get_set_int (&p->largeSetLowerBound, interp, argc, argv);
}
/*
static int do_mediumSetPresentNumber (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetCObj *obj = o;
-
- return get_set_int (&obj->mediumSetPresentNumber, interp, argc, argv);
+ IRSetCObj *p = o;
+
+ if (argc <= 0)
+ {
+ p->mediumSetPresentNumber = 0;
+ return TCL_OK;
+ }
+ return get_set_int (&p->mediumSetPresentNumber, interp, argc, argv);
}
};
static IRMethod ir_set_c_method_tab[] = {
-{ 0, "databaseNames", do_databaseNames},
-{ 0, "replaceIndicator", do_replaceIndicator},
-{ 0, "queryType", do_queryType },
-{ 0, "smallSetUpperBound", do_smallSetUpperBound},
-{ 0, "largeSetLowerBound", do_largeSetLowerBound},
-{ 0, "mediumSetPresentNumber", do_mediumSetPresentNumber},
+{ 0, "databaseNames", do_databaseNames},
+{ 0, "replaceIndicator", do_replaceIndicator},
+{ 0, "queryType", do_queryType },
+{ 0, "smallSetUpperBound", do_smallSetUpperBound},
+{ 0, "largeSetLowerBound", do_largeSetLowerBound},
+{ 0, "mediumSetPresentNumber", do_mediumSetPresentNumber},
{ 0, NULL, NULL}
};
static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
int argc, char **argv)
{
+ IRMethods tab[3];
+ IRObj *p = clientData;
+
if (argc < 2)
return ir_method_r (clientData, interp, argc, argv, ir_method_tab);
- if (ir_method (clientData, interp, argc, argv,
- ir_method_tab, 1) == TCL_OK)
- return TCL_OK;
- return ir_method (&((IRObj*) clientData)->set_inher, interp,
- argc, argv, ir_set_c_method_tab, 0);
+
+ tab[0].tab = ir_method_tab;
+ tab[0].obj = p;
+ tab[1].tab = ir_set_c_method_tab;
+ tab[1].obj = &p->set_inher;
+ tab[2].tab = NULL;
+
+ return ir_method (interp, argc, argv, tab);
}
/*
*/
static void ir_obj_delete (ClientData clientData)
{
- free ( (void*) clientData);
-}
+ IRObj *obj = clientData;
+ IRMethods tab[3];
-static int ir_reset_inher (Tcl_Interp *interp, IRSetCObj *o)
-{
- o->smallSetUpperBound = 0;
- o->largeSetLowerBound = 2;
- o->mediumSetPresentNumber = 0;
- o->replaceIndicator = 1;
-#if 0
- obj->databaseNames = NULL;
- obj->num_databaseNames = 0;
-#else
- o->num_databaseNames = 1;
- if (!(o->databaseNames =
- ir_malloc (interp, sizeof(*o->databaseNames))))
- return TCL_ERROR;
- if (ir_strdup (interp, &o->databaseNames[0], "Default")
- == TCL_ERROR)
- return TCL_ERROR;
-#endif
- if (ir_strdup (interp, &o->queryType, "rpn") == TCL_ERROR)
- return TCL_ERROR;
- return TCL_OK;
+ --(obj->ref_count);
+ if (obj->ref_count > 0)
+ return;
+ assert (obj->ref_count == 0);
+
+ tab[0].tab = ir_method_tab;
+ tab[0].obj = obj;
+ tab[1].tab = ir_set_c_method_tab;
+ tab[1].obj = &obj->set_inher;
+ tab[2].tab = NULL;
+
+ ir_method (NULL, -1, NULL, tab);
+ odr_destroy (obj->odr_in);
+ odr_destroy (obj->odr_out);
+ odr_destroy (obj->odr_pr);
+ free (obj->buf_out);
+ free (obj->buf_in);
+ free (obj);
}
/*
static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
int argc, char **argv)
{
+ IRMethods tab[3];
IRObj *obj;
+#if CCL2RPN
FILE *inf;
+#endif
if (argc != 2)
{
}
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->bib1.proto = PROTO_Z3950;
- obj->bib1.class = CLASS_ATTSET;
- obj->bib1.value = VAL_BIB1;
-
- 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->targetImplementationName = NULL;
- obj->targetImplementationId = NULL;
- obj->targetImplementationVersion = NULL;
- obj->userInformationField = NULL;
-
- obj->hostname = NULL;
+ obj->ref_count = 1;
+#if CCL2RPN
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);
+#endif
obj->odr_in = odr_createmem (ODR_DECODE);
obj->odr_out = odr_createmem (ODR_ENCODE);
obj->len_in = 0;
obj->buf_in = NULL;
- obj->callback = NULL;
- obj->failback = NULL;
+ tab[0].tab = ir_method_tab;
+ tab[0].obj = obj;
+ tab[1].tab = ir_set_c_method_tab;
+ tab[1].obj = &obj->set_inher;
+ tab[2].tab = NULL;
- if (ir_reset_inher (interp, &obj->set_inher) == TCL_ERROR)
+ if (ir_method (interp, 0, NULL, tab) == TCL_ERROR)
return TCL_ERROR;
Tcl_CreateCommand (interp, argv[1], ir_obj_method,
(ClientData) obj, ir_obj_delete);
IRSetObj *obj = o;
IRObj *p = obj->parent;
int r;
+ oident bib1;
+
+ if (argc <= 0)
+ return TCL_OK;
p->set_child = o;
if (argc != 3)
interp->result = "not connected";
return TCL_ERROR;
}
+ odr_reset (p->odr_out);
apdu.which = Z_APDU_searchRequest;
apdu.u.searchRequest = &req;
+
+ bib1.proto = PROTO_Z3950;
+ bib1.class = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
req.referenceId = 0;
req.smallSetUpperBound = &p->set_inher.smallSetUpperBound;
req.mediumSetPresentNumber = &p->set_inher.mediumSetPresentNumber;
req.replaceIndicator = &p->set_inher.replaceIndicator;
req.resultSetName = obj->setName ? obj->setName : "Default";
+ logf (LOG_DEBUG, "Search, resultSetName %s", req.resultSetName);
req.num_databaseNames = p->set_inher.num_databaseNames;
req.databaseNames = p->set_inher.databaseNames;
- printf ("Search:");
for (r=0; r < p->set_inher.num_databaseNames; r++)
- {
- printf (" %s", p->set_inher.databaseNames[r]);
- }
+ logf (LOG_DEBUG, " Database %s", p->set_inher.databaseNames[r]);
req.smallSetElementSetNames = 0;
req.mediumSetElementSetNames = 0;
req.preferredRecordSyntax = 0;
if (!strcmp (p->set_inher.queryType, "rpn"))
{
+ Z_RPNQuery *RPNquery;
+
+ RPNquery = p_query_rpn (p->odr_out, argv[2]);
+ if (!RPNquery)
+ {
+ Tcl_AppendResult (interp, "Syntax error in query", NULL);
+ return TCL_ERROR;
+ }
+ RPNquery->attributeSetId = oid_getoidbyent (&bib1);
+ query.which = Z_Query_type_1;
+ query.u.type_1 = RPNquery;
+ logf (LOG_DEBUG, "RPN");
+ }
+#if CCL2RPN
+ else if (!strcmp (p->set_inher.queryType, "cclrpn"))
+ {
int error;
int pos;
struct ccl_rpn_node *rpn;
}
ccl_pr_tree (rpn, stderr);
fprintf (stderr, "\n");
- query.which = Z_Query_type_1;
assert((RPNquery = ccl_rpn_query(rpn)));
- RPNquery->attributeSetId = oid_getoidbyent (&p->bib1);
+ RPNquery->attributeSetId = oid_getoidbyent (&bib1);
+ query.which = Z_Query_type_1;
query.u.type_1 = RPNquery;
- printf ("- RPN\n");
+ logf (LOG_DEBUG, "CCLRPN");
}
+#endif
else if (!strcmp (p->set_inher.queryType, "ccl"))
{
query.which = Z_Query_type_2;
query.u.type_2 = &ccl_query;
ccl_query.buf = (unsigned char *) argv[2];
ccl_query.len = strlen (argv[2]);
- printf ("- CCL\n");
+ logf (LOG_DEBUG, "CCL");
}
else
{
else if (r == 1)
{
ir_select_add_write (cs_fileno(p->cs_link), p);
- printf("Sent part of searchRequest (%d bytes).\n", p->slen);
+ logf (LOG_DEBUG, "Sent part of searchRequest (%d bytes)", p->slen);
}
else
{
- printf ("Whole search request\n");
+ logf (LOG_DEBUG, "Whole search request (%d bytes)", p->slen);
}
return TCL_OK;
}
{
IRSetObj *obj = o;
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&obj->resultCount, interp, argc, argv);
}
{
IRSetObj *obj = o;
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&obj->searchStatus, interp, argc, argv);
}
/*
+ * do_presentStatus: Get search status (after search/present response)
+ */
+static int do_presentStatus (void *o, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IRSetObj *obj = o;
+
+ if (argc <= 0)
+ return TCL_OK;
+ return get_set_int (&obj->presentStatus, interp, argc, argv);
+}
+
+/*
+ * do_nextResultSetPosition: Get next result set position
+ * (after search/present response)
+ */
+static int do_nextResultSetPosition (void *o, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IRSetObj *obj = o;
+
+ if (argc <= 0)
+ return TCL_OK;
+ return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);
+}
+
+/*
* do_setName: Set result Set name
*/
static int do_setName (void *o, Tcl_Interp *interp,
{
IRSetObj *obj = o;
+ if (argc == 0)
+ return ir_strdup (interp, &obj->setName, "Default");
+ else if (argc == -1)
+ return ir_strdel (interp, &obj->setName);
if (argc == 3)
{
free (obj->setName);
{
IRSetObj *obj = o;
- return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
-}
-
-static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
- int argc, char **argv)
-{
- Iso2709Anchor a;
- char *data;
-
- if (!rec)
+ if (argc < 0)
return TCL_OK;
- a = iso2709_a_mk (rec);
- while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
- {
- 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)
-{
- Iso2709Anchor a;
- char *tag;
- char *indicator;
- char *identifier;
- char *data;
- char *ptag = "";
-
- if (!rec)
- return TCL_OK;
- a = iso2709_a_mk (rec);
- while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
- {
- if (!(iso2709_a_info_field (a, &tag, &indicator, &identifier, &data)))
- break;
- if (strcmp (tag, ptag))
- {
- if (*ptag)
- Tcl_AppendResult (interp, "}} ", NULL);
- if (!indicator)
- Tcl_AppendResult (interp, "{", tag, " {} {", NULL);
- else
- Tcl_AppendResult (interp, "{", tag, " {", indicator,
- "} {", NULL);
- ptag = tag;
- }
- 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;
+ return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
}
/*
int offset;
IRRecordList *rl;
+ if (argc == 0)
+ {
+ obj->record_list = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ {
+ delete_IR_records (obj);
+ return TCL_OK;
+ }
if (argc < 3)
{
sprintf (interp->result, "wrong # args");
IRRecordList *rl;
char buf[20];
+ if (argc <= 0)
+ return TCL_OK;
if (argc < 3)
{
sprintf (interp->result, "wrong # args");
}
/*
- * do_recordMarc: Get ISO2709 Record lines/fields
+ * do_getMarc: Get ISO2709 Record lines/fields
*/
-static int do_recordMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_getMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
{
IRSetObj *obj = o;
int offset;
IRRecordList *rl;
- if (argc < 4)
+ if (argc <= 0)
+ return TCL_OK;
+ if (argc < 7)
{
sprintf (interp->result, "wrong # args");
return TCL_ERROR;
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;
- }
+ return ir_tcl_get_marc (interp, rl->u.dbrec.buf, argc, argv);
}
{
IRSetObj *obj = o;
+ if (argc == 0)
+ {
+ obj->recordFlag = 0;
+ obj->addinfo = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ return ir_strdel (interp, &obj->addinfo);
if (!obj->recordFlag)
{
Tcl_AppendElement (interp, "OK");
int number;
int r;
+ if (argc <= 0)
+ return TCL_OK;
if (argc >= 3)
{
if (Tcl_GetInt (interp, argv[2], &start) == TCL_ERROR)
interp->result = "not connected";
return TCL_ERROR;
}
+ odr_reset (p->odr_out);
obj->start = start;
obj->number = 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);
+ logf (LOG_DEBUG, "Part of present request, start=%d, num=%d"
+ " (%d bytes)", start, number, p->slen);
}
else
{
- printf ("Whole present request, start=%d, num=%d (%d bytes)\n",
- start, number, p->slen);
+ logf (LOG_DEBUG, "Whole present request, start=%d, num=%d"
+ " (%d bytes)", start, number, p->slen);
}
return TCL_OK;
}
{
IRSetObj *setobj = o;
FILE *inf;
+ size_t size;
int no = 1;
- const char *buf;
+ char *buf;
+ if (argc <= 0)
+ return TCL_OK;
if (argc < 3)
{
interp->result = "wrong # args";
Tcl_AppendResult (interp, "Cannot open ", argv[2], NULL);
return TCL_ERROR;
}
- while ((buf = iso2709_read (inf)))
+ while ((buf = ir_tcl_fread_marc (inf, &size)))
{
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;
+ rl->u.dbrec.buf = buf;
+ rl->u.dbrec.size = size;
no++;
}
setobj->numberOfRecordsReturned = no-1;
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[] = {
+static IRMethod ir_set_method_tab[] = {
{ 0, "search", do_search },
{ 0, "searchStatus", do_searchStatus },
+ { 0, "presentStatus", do_presentStatus },
+ { 0, "nextResultSetPosition", do_nextResultSetPosition },
{ 0, "setName", do_setName },
{ 0, "resultCount", do_resultCount },
{ 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },
{ 0, "present", do_present },
{ 0, "recordType", do_recordType },
- { 0, "recordMarc", do_recordMarc },
- { 0, "recordDiag", do_recordDiag },
+ { 0, "getMarc", do_getMarc },
+ { 0, "Diag", do_recordDiag },
{ 0, "responseStatus", do_responseStatus },
{ 0, "loadFile", do_loadFile },
{ 0, NULL, NULL}
- };
+};
+
+/*
+ * ir_set_obj_method: IR Set Object methods
+ */
+static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IRMethods tabs[3];
+ IRSetObj *p = clientData;
if (argc < 2)
{
interp->result = "wrong # args";
return TCL_ERROR;
}
- if (ir_method (clientData, interp, argc, argv, tab, 1) == TCL_OK)
- return TCL_OK;
- return ir_method (&((IRSetObj *)clientData)->set_inher, interp, argc,
- argv, ir_set_c_method_tab, 0);
+ tabs[0].tab = ir_set_method_tab;
+ tabs[0].obj = p;
+ tabs[1].tab = ir_set_c_method_tab;
+ tabs[1].obj = &p->set_inher;
+ tabs[2].tab = NULL;
+
+ return ir_method (interp, argc, argv, tabs);
}
/*
*/
static void ir_set_obj_delete (ClientData clientData)
{
- free ( (void*) clientData);
+ IRMethods tabs[3];
+ IRSetObj *p = clientData;
+
+ tabs[0].tab = ir_set_method_tab;
+ tabs[0].obj = p;
+ tabs[1].tab = ir_set_c_method_tab;
+ tabs[1].obj = &p->set_inher;
+ tabs[2].tab = NULL;
+
+ ir_method (NULL, -1, NULL, tabs);
+
+ free (p);
}
/*
* ir_set_obj_mk: IR Set Object creation
*/
static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
+ IRMethods tabs[3];
IRSetObj *obj;
if (argc < 2 || argc > 3)
interp->result = "wrong # args";
return TCL_ERROR;
}
+ if (!(obj = ir_malloc (interp, sizeof(*obj))))
+ return TCL_ERROR;
else if (argc == 3)
{
Tcl_CmdInfo parent_info;
interp->result = "No parent";
return TCL_ERROR;
}
- if (!(obj = ir_malloc (interp, sizeof(*obj))))
- return TCL_ERROR;
obj->parent = (IRObj *) parent_info.clientData;
dst = &obj->set_inher;
return TCL_ERROR;
for (i = 0; i < dst->num_databaseNames; i++)
{
- printf ("database %i %s\n", i, src->databaseNames[i]);
if (ir_strdup (interp, &dst->databaseNames[i],
src->databaseNames[i]) == TCL_ERROR)
return TCL_ERROR;
dst->smallSetUpperBound = src->smallSetUpperBound;
dst->largeSetLowerBound = src->largeSetLowerBound;
dst->mediumSetPresentNumber = src->mediumSetPresentNumber;
- printf ("ssu lsl msp %d %d %d\n", dst->smallSetUpperBound,
- dst->largeSetLowerBound, dst->mediumSetPresentNumber);
}
else
obj->parent = NULL;
- if (ir_strdup (interp, &obj->setName, argv[2]) == TCL_ERROR)
+
+ tabs[0].tab = ir_set_method_tab;
+ tabs[0].obj = obj;
+ tabs[1].tab = NULL;
+
+ if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
return TCL_ERROR;
- obj->record_list = NULL;
- obj->addinfo = NULL;
+
Tcl_CreateCommand (interp, argv[1], ir_set_obj_method,
(ClientData) obj, ir_set_obj_delete);
return TCL_OK;
Z_APDU apdu, *apdup = &apdu;
IRScanObj *obj = o;
IRObj *p = obj->parent;
- int r, pos;
+ int r;
+ oident bib1;
+#if CCL2RPN
struct ccl_rpn_node *rpn;
+ int pos;
+#endif
+ if (argc <= 0)
+ return TCL_OK;
p->scan_child = o;
if (argc != 3)
{
interp->result = "not connected";
return TCL_ERROR;
}
+ odr_reset (p->odr_out);
+
+ bib1.proto = PROTO_Z3950;
+ bib1.class = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
+
apdu.which = Z_APDU_scanRequest;
apdu.u.scanRequest = &req;
req.referenceId = NULL;
req.num_databaseNames = p->set_inher.num_databaseNames;
req.databaseNames = p->set_inher.databaseNames;
- req.attributeSet = oid_getoidbyent (&p->bib1);
+ req.attributeSet = oid_getoidbyent (&bib1);
-#if 0
- if (!(req.termListAndStartPoint =
- ir_malloc (interp, sizeof(*req.termListAndStartPoint))))
- return TCL_ERROR;
- req.termListAndStartPoint->num_attributes = 0;
- req.termListAndStartPoint->attributeList = NULL;
- if (!(req.termListAndStartPoint->term = ir_malloc (interp,
- sizeof(Z_Term))))
- return TCL_ERROR;
- req.termListAndStartPoint->term->which = Z_Term_general;
- if (!(req.termListAndStartPoint->term->u.general =
- ir_malloc (interp, sizeof(*req.termListAndStartPoint->
- term->u.general))))
- return TCL_ERROR;
- if (ir_strdup (interp, &req.termListAndStartPoint->term->u.general->buf,
- argv[2]) == TCL_ERROR)
- return TCL_ERROR;
- req.termListAndStartPoint->term->u.general->len =
- req.termListAndStartPoint->term->u.general->size = strlen(argv[2]);
+#if !CCL2RPN
+ if (!(req.termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
+ {
+ Tcl_AppendResult (interp, "Syntax error in query", NULL);
+ return TCL_ERROR;
+ }
#else
rpn = ccl_find_str(p->bibset, argv[2], &r, &pos);
if (r)
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);
+ logf (LOG_DEBUG, "stepSize=%d", *req.stepSize);
+ logf (LOG_DEBUG, "numberOfTermsRequested=%d",
+ *req.numberOfTermsRequested);
+ logf (LOG_DEBUG, "preferredPositionInResponse=%d",
+ *req.preferredPositionInResponse);
if (!z_APDU (p->odr_out, &apdup, 0))
{
else if (r == 1)
{
ir_select_add_write (cs_fileno(p->cs_link), p);
- printf("Sent part of scanRequest (%d bytes).\n", p->slen);
+ logf (LOG_DEBUG, "Sent part of scanRequest (%d bytes)", p->slen);
}
else
{
- printf ("Whole scan request\n");
+ logf (LOG_DEBUG, "Whole scan request (%d bytes)", p->slen);
}
return TCL_OK;
}
int argc, char **argv)
{
IRScanObj *p = obj;
+ if (argc <= 0)
+ {
+ p->stepSize = 0;
+ return TCL_OK;
+ }
return get_set_int (&p->stepSize, interp, argc, argv);
}
int argc, char **argv)
{
IRScanObj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->numberOfTermsRequested = 20;
+ return TCL_OK;
+ }
return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
}
int argc, char **argv)
{
IRScanObj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->preferredPositionInResponse = 1;
+ return TCL_OK;
+ }
return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);
}
int argc, char **argv)
{
IRScanObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->scanStatus, interp, argc, argv);
}
int argc, char **argv)
{
IRScanObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);
}
int argc, char **argv)
{
IRScanObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->positionOfTerm, interp, argc, argv);
}
int i;
char numstr[20];
+ if (argc == 0)
+ {
+ p->entries_flag = 0;
+ p->entries = NULL;
+ p->nonSurrogateDiagnostics = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ {
+ p->entries_flag = 0;
+ /* release entries */
+ p->entries = NULL;
+ /* release non diagnostics */
+ p->nonSurrogateDiagnostics = NULL;
+ return TCL_OK;
+ }
if (argc != 3)
{
interp->result = "wrong # args";
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[] = {
+static IRMethod ir_scan_method_tab[] = {
{ 0, "scan", do_scan },
{ 0, "stepSize", do_stepSize },
{ 0, "numberOfTermsRequested", do_numberOfTermsRequested },
{ 0, "positionOfTerm", do_positionOfTerm },
{ 0, "scanLine", do_scanLine },
{ 0, NULL, NULL}
- };
+};
+
+/*
+ * ir_scan_obj_method: IR Scan Object methods
+ */
+static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IRMethods tabs[3];
if (argc < 2)
{
interp->result = "wrong # args";
return TCL_ERROR;
}
- return ir_method (clientData, interp, argc, argv, tab, 0);
+ tabs[0].tab = ir_scan_method_tab;
+ tabs[0].obj = clientData;
+ tabs[1].tab = NULL;
+
+ return ir_method (interp, argc, argv, tabs);
}
/*
{
Tcl_CmdInfo parent_info;
IRScanObj *obj;
+ IRMethods tabs[3];
if (argc != 2)
{
if (!(obj = ir_malloc (interp, sizeof(*obj))))
return TCL_ERROR;
+ tabs[0].tab = ir_scan_method_tab;
+ tabs[0].obj = obj;
+ tabs[1].tab = NULL;
+
+ if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
+ return TCL_ERROR;
+#if 0
obj->stepSize = 0;
obj->numberOfTermsRequested = 20;
obj->preferredPositionInResponse = 1;
obj->entries = NULL;
obj->nonSurrogateDiagnostics = NULL;
+#endif
obj->parent = (IRObj *) parent_info.clientData;
Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,
p->initResult = *initrs->result ? 1 : 0;
if (!*initrs->result)
- printf("Connection rejected by target.\n");
+ logf (LOG_DEBUG, "Connection rejected by target");
else
- printf("Connection accepted by target.\n");
+ logf (LOG_DEBUG, "Connection accepted by target");
free (p->targetImplementationId);
ir_strdup (p->interp, &p->targetImplementationId,
p->maximumRecordSize = *initrs->maximumRecordSize;
p->preferredMessageSize = *initrs->preferredMessageSize;
-
+
+ memcpy (&p->options, initrs->options, sizeof(initrs->options));
+ memcpy (&p->protocolVersion, initrs->protocolVersion,
+ sizeof(initrs->protocolVersion));
free (p->userInformationField);
p->userInformationField = NULL;
if (initrs->userInformationField)
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 : "");
+ logf (LOG_DEBUG, "Diagnostic response. %s (%d): %s",
+ diagbib1_str (setobj->condition),
+ setobj->condition,
+ setobj->addinfo ? setobj->addinfo : "");
}
else
{
setobj->numberOfRecordsReturned =
zrs->u.databaseOrSurDiagnostics->num_records;
- printf ("Got %d records\n", setobj->numberOfRecordsReturned);
+ logf (LOG_DEBUG, "Got %d records", setobj->numberOfRecordsReturned);
for (offset = 0; offset<setobj->numberOfRecordsReturned; offset++)
{
rl = new_IR_record (setobj, setobj->start + offset,
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.dbrec.size = zr->u.octet_aligned->len;
+ if (oe->which == ODR_EXTERNAL_octet && rl->u.dbrec.size > 0)
{
const char *buf = (char*) zr->u.octet_aligned->buf;
- rl->u.marc.rec = iso2709_cvt (buf);
+ if ((rl->u.dbrec.buf = malloc (rl->u.dbrec.size)))
+ memcpy (rl->u.dbrec.buf, buf, rl->u.dbrec.size);
}
else
- rl->u.marc.rec = NULL;
+ rl->u.dbrec.buf = NULL;
}
}
}
{
setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
setobj->resultCount = *searchrs->resultCount;
- printf ("Search response %d, %d hits\n",
- setobj->searchStatus, setobj->resultCount);
+ if (searchrs->presentStatus)
+ setobj->presentStatus = *searchrs->presentStatus;
+ if (searchrs->nextResultSetPosition)
+ setobj->nextResultSetPosition = *searchrs->nextResultSetPosition;
+
+ logf (LOG_DEBUG, "Search response %d, %d hits",
+ setobj->searchStatus, setobj->resultCount);
if (zrs)
ir_handleRecords (o, zrs);
else
setobj->recordFlag = 0;
}
else
- printf ("Search response, no object!\n");
+ logf (LOG_DEBUG, "Search response, no object!");
}
IRSetObj *setobj = p->set_child;
Z_Records *zrs = presrs->records;
- printf ("Received presentResponse\n");
+ logf (LOG_DEBUG, "Received presentResponse");
+ setobj->presentStatus = *presrs->presentStatus;
+ setobj->nextResultSetPosition = *presrs->nextResultSetPosition;
if (zrs)
ir_handleRecords (o, zrs);
else
{
setobj->recordFlag = 0;
- printf ("No records!\n");
+ logf (LOG_DEBUG, "No records!");
}
}
IRObj *p = o;
IRScanObj *scanobj = p->scan_child;
- printf ("Received scanResponse\n");
+ logf (LOG_DEBUG, "Received scanResponse");
scanobj->scanStatus = *scanrs->scanStatus;
- printf ("scanStatus=%d\n", scanobj->scanStatus);
+ logf (LOG_DEBUG, "scanStatus=%d", scanobj->scanStatus);
if (scanrs->stepSize)
scanobj->stepSize = *scanrs->stepSize;
- printf ("stepSize=%d\n", scanobj->stepSize);
+ logf (LOG_DEBUG, "stepSize=%d", scanobj->stepSize);
scanobj->numberOfEntriesReturned = *scanrs->numberOfEntriesReturned;
- printf ("numberOfEntriesReturned=%d\n", scanobj->numberOfEntriesReturned);
+ logf (LOG_DEBUG, "numberOfEntriesReturned=%d",
+ scanobj->numberOfEntriesReturned);
if (scanrs->positionOfTerm)
scanobj->positionOfTerm = *scanrs->positionOfTerm;
else
scanobj->positionOfTerm = -1;
- printf ("positionOfTerm=%d\n", scanobj->positionOfTerm);
+ logf (LOG_DEBUG, "positionOfTerm=%d", scanobj->positionOfTerm);
free (scanobj->entries);
scanobj->entries = NULL;
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (r < 0)
{
- printf ("cs_rcvconnect error\n");
+ logf (LOG_DEBUG, "cs_rcvconnect error");
if (p->failback)
Tcl_Eval (p->interp, p->failback);
- do_disconnect (p, NULL, 0, NULL);
+ do_disconnect (p, NULL, 2, NULL);
return;
}
if (p->callback)
}
do
{
- if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) <= 0)
+ /* signal one more use of ir object - callbacks must not
+ release the ir memory (p pointer) */
+ ++(p->ref_count);
+ if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) <= 0)
{
- printf ("cs_get failed\n");
+ logf (LOG_DEBUG, "cs_get failed, code %d", r);
ir_select_remove (cs_fileno (p->cs_link), p);
if (p->failback)
Tcl_Eval (p->interp, p->failback);
- do_disconnect (p, NULL, 0, NULL);
+ do_disconnect (p, NULL, 2, NULL);
+
+ /* relase ir object now if callback deleted it */
+ ir_obj_delete (p);
return;
}
if (r == 1)
return ;
odr_setbuf (p->odr_in, p->buf_in, r, 0);
- printf ("cs_get ok, got %d\n", r);
+ logf (LOG_DEBUG, "cs_get ok, got %d", r);
if (!z_APDU (p->odr_in, &apdu, 0))
{
- printf ("%s\n", odr_errlist [odr_geterror (p->odr_in)]);
+ logf (LOG_DEBUG, "%s", odr_errlist [odr_geterror (p->odr_in)]);
if (p->failback)
Tcl_Eval (p->interp, p->failback);
- do_disconnect (p, NULL, 0, NULL);
+ do_disconnect (p, NULL, 2, NULL);
+
+ /* relase ir object now if callback deleted it */
+ ir_obj_delete (p);
return;
}
switch(apdu->which)
ir_scanResponse (p, apdu->u.scanResponse);
break;
default:
- printf("Received unknown APDU type (%d).\n",
- apdu->which);
+ logf (LOG_WARN, "Received unknown APDU type (%d)", apdu->which);
if (p->failback)
Tcl_Eval (p->interp, p->failback);
- do_disconnect (p, NULL, 0, NULL);
+ do_disconnect (p, NULL, 2, NULL);
}
+ odr_reset (p->odr_in);
if (p->callback)
Tcl_Eval (p->interp, p->callback);
- } while (cs_more (p->cs_link));
+ if (p->ref_count == 1)
+ {
+ ir_obj_delete (p);
+ return;
+ }
+ --(p->ref_count);
+ } while (p->cs_link && cs_more (p->cs_link));
}
/*
IRObj *p = clientData;
int r;
- printf ("In write handler.....\n");
+ logf (LOG_DEBUG, "In write handler");
if (p->connectFlag)
{
r = cs_rcvconnect (p->cs_link);
p->connectFlag = 0;
if (r < 0)
{
- printf ("cs_rcvconnect error\n");
+ logf (LOG_DEBUG, "cs_rcvconnect error");
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);
+ do_disconnect (p, NULL, 2, NULL);
return;
}
ir_select_remove_write (cs_fileno (p->cs_link), p);
}
if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
{
- printf ("select write fail\n");
+ logf (LOG_DEBUG, "select write fail");
if (p->failback)
Tcl_Eval (p->interp, p->failback);
- do_disconnect (p, NULL, 0, NULL);
+ do_disconnect (p, NULL, 2, NULL);
}
else if (r == 0) /* remove select bit */
{
projects / ir-tcl-moved-to-github.git / blobdiff