/*
* 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.31 1995-05-26 11:44:10 adam
+ * Revision 1.38 1995-06-01 16:36:47 adam
+ * About buttons. Minor bug fixes.
+ *
+ * Revision 1.37 1995/06/01 07:31:20 adam
+ * Rename of many typedefs -> IrTcl_...
+ *
+ * Revision 1.36 1995/05/31 13:09:59 adam
+ * Client searches/presents may be interrupted.
+ * New moving book-logo.
+ *
+ * Revision 1.35 1995/05/31 08:36:33 adam
+ * Bug fix in client.tcl: didn't save options on clientrc.tcl.
+ * New method: referenceId. More work on scan.
+ *
+ * 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.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
+ * of IrTcl_RecordList manipulations. Full MARC record presentation in
* search.tcl.
*
* Revision 1.7 1995/03/14 17:32:29 adam
int type;
char *name;
int (*method) (void *obj, Tcl_Interp *interp, int argc, char **argv);
-} IRMethod;
+} IrTcl_Method;
typedef struct {
void *obj;
- IRMethod *tab;
-} IRMethods;
+ IrTcl_Method *tab;
+} IrTcl_Methods;
-static int do_disconnect (void *obj,Tcl_Interp *interp, int argc, char **argv);
+static int do_disconnect (void *obj, Tcl_Interp *interp,
+ int argc, char **argv);
-static IRRecordList *new_IR_record (IRSetObj *setobj, int no, int which)
+static IrTcl_RecordList *new_IR_record (IrTcl_SetObj *setobj,
+ int no, int which)
{
- IRRecordList *rl;
+ IrTcl_RecordList *rl;
for (rl = setobj->record_list; rl; rl = rl->next)
{
return rl;
}
-static IRRecordList *find_IR_record (IRSetObj *setobj, int no)
+static IrTcl_RecordList *find_IR_record (IrTcl_SetObj *setobj, int no)
{
- IRRecordList *rl;
+ IrTcl_RecordList *rl;
for (rl = setobj->record_list; rl; rl = rl->next)
if (no == rl->no)
return NULL;
}
+static void delete_IR_records (IrTcl_SetObj *setobj)
+{
+ IrTcl_RecordList *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
*/
* mk_nonSurrogateDiagnostics: Make Tcl result with diagnostic info
*/
static int mk_nonSurrogateDiagnostics (Tcl_Interp *interp,
- int condition,
- const char *addinfo)
+ int condition, const char *addinfo)
{
char buf[20];
const char *cp;
}
/*
- * get_parent_info: Returns information about parent object.
- */
-static int get_parent_info (Tcl_Interp *interp, const char *name,
- Tcl_CmdInfo *parent_info,
- const char **suffix)
-{
- char parent_name[128];
- const char *csep = strrchr (name, '.');
- int pos;
-
- if (!csep)
- {
- interp->result = "missing .";
- return TCL_ERROR;
- }
- if (suffix)
- *suffix = csep+1;
- pos = csep-name;
- if (pos > 127)
- pos = 127;
- memcpy (parent_name, name, pos);
- parent_name[pos] = '\0';
- if (!Tcl_GetCommandInfo (interp, parent_name, parent_info))
- {
- interp->result = "No parent";
- return TCL_ERROR;
- }
- return TCL_OK;
-}
-
-/*
* ir_method: Search for method in table and invoke method handler
*/
-int ir_method (Tcl_Interp *interp, int argc, char **argv, IRMethods *tab)
+int ir_method (Tcl_Interp *interp, int argc, char **argv, IrTcl_Methods *tab)
{
- IRMethods *tab_i = tab;
- IRMethod *t;
+ IrTcl_Methods *tab_i = tab;
+ IrTcl_Method *t;
for (tab_i = tab; tab_i->tab; tab_i++)
for (t = tab_i->tab; t->name; t++)
- if (!strcmp (t->name, argv[1]))
- return (*t->method)(tab_i->obj, interp, argc, argv);
+ 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_method_r: Get status for all readable elements
*/
int ir_method_r (void *obj, Tcl_Interp *interp, int argc, char **argv,
- IRMethod *tab)
+ IrTcl_Method *tab)
{
char *argv_n[3];
int argc_n;
}
/*
- * ir_asc2bitmask: Ascii to ODR bitmask conversion
- */
-int ir_asc2bitmask (const char *asc, Odr_bitmask *ob)
-{
- const char *cp = asc + strlen(asc);
- int bitno = 0;
-
- ODR_MASK_ZERO (ob);
- do
- {
- if (*--cp == '1')
- ODR_MASK_SET (ob, bitno);
- bitno++;
- } while (cp != asc);
- return bitno;
-}
-
-/*
* ir_named_bits: get/set named bits
*/
int ir_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob,
- Tcl_Interp *interp,
- int argc, char **argv)
+ Tcl_Interp *interp, int argc, char **argv)
{
struct ir_named_entry *ti;
if (argc > 0)
}
/*
+ * 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)
return p;
}
+static void set_referenceId (ODR o, Z_ReferenceId **dst, const char *src)
+{
+ if (!src || !*src)
+ *dst = NULL;
+ else
+ {
+ *dst = odr_malloc (o, sizeof(**dst));
+ (*dst)->size = (*dst)->len = strlen(src);
+ (*dst)->buf = odr_malloc (o, (*dst)->len);
+ memcpy ((*dst)->buf, src, (*dst)->len);
+ }
+}
+
+static void get_referenceId (char **dst, Z_ReferenceId *src)
+{
+ free (*dst);
+ if (!src)
+ {
+ *dst = NULL;
+ return;
+ }
+ *dst = malloc (src->len+1);
+ memcpy (*dst, src->buf, src->len);
+ (*dst)[src->len] = '\0';
+}
+
/* ------------------------------------------------------- */
/*
* do_init_request: init method on IR object
*/
static int do_init_request (void *obj, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
Z_APDU apdu, *apdup = &apdu;
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
Z_InitRequest req;
int r;
+ if (argc <= 0)
+ return TCL_OK;
if (!p->cs_link)
{
interp->result = "not connected";
}
odr_reset (p->odr_out);
- req.referenceId = 0;
+ set_referenceId (p->odr_out, &req.referenceId, p->set_inher.referenceId);
req.options = &p->options;
req.protocolVersion = &p->protocolVersion;
req.preferredMessageSize = &p->preferredMessageSize;
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)
{ "4", 3 },
{ NULL,0}
};
- IRObj *p = obj;
+ IrTcl_Obj *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);
}
{ "namedResultSets", 14},
{ NULL, 0}
};
- IRObj *p = obj;
+ IrTcl_Obj *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);
}
static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->preferredMessageSize = 4096;
+ return TCL_OK;
+ }
return get_set_int (&p->preferredMessageSize, interp, argc, argv);
}
* do_maximumRecordSize: Set/get maximum record size
*/
static int do_maximumRecordSize (void *obj, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->maximumRecordSize = 32768;
+ return TCL_OK;
+ }
return get_set_int (&p->maximumRecordSize, interp, argc, argv);
}
static int do_initResult (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
-
+ IrTcl_Obj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->initResult, interp, argc, argv);
}
static int do_implementationName (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *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;
}
- Tcl_AppendResult (interp, p->implementationName,
- (char*) NULL);
+ Tcl_AppendResult (interp, p->implementationName, (char*) NULL);
return TCL_OK;
}
static int do_implementationId (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
+ IrTcl_Obj *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;
}
* do_targetImplementationName: Get Implementation Name of target.
*/
static int do_targetImplementationName (void *obj, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
- Tcl_AppendResult (interp, p->targetImplementationName,
- (char*) NULL);
+ 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);
+ IrTcl_Obj *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);
+ IrTcl_Obj *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)
{
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
- if (argc >= 3)
+ if (argc >= 3 || argc == -1)
{
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])
}
if (p->idAuthenticationOpen)
Tcl_AppendElement (interp, p->idAuthenticationOpen);
- else
+ else if (p->idAuthenticationGroupId)
{
- Tcl_AppendElement (interp, p->idAuthenticationGroupId ?
- p->idAuthenticationGroupId : "");
- Tcl_AppendElement (interp, p->idAuthenticationUserId ?
- p->idAuthenticationUserId : "");
- Tcl_AppendElement (interp, p->idAuthenticationPassword ?
- p->idAuthenticationPassword : "");
+ Tcl_AppendElement (interp, p->idAuthenticationGroupId);
+ Tcl_AppendElement (interp, p->idAuthenticationUserId);
+ Tcl_AppendElement (interp, p->idAuthenticationPassword);
}
return TCL_OK;
}
int argc, char **argv)
{
void *addr;
- IRObj *p = obj;
+ IrTcl_Obj *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";
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);
static int do_disconnect (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
+ if (argc == 0)
+ {
+ p->connectFlag = 0;
+ p->hostname = NULL;
+ p->cs_link = NULL;
+ return TCL_OK;
+ }
if (p->hostname)
{
free (p->hostname);
static int do_comstack (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *obj = o;
+ IrTcl_Obj *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)
static int do_protocol (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *obj = o;
+ IrTcl_Obj *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)
static int do_callback (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *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;
static int do_failback (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
+ IrTcl_Obj *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 argc, char **argv)
{
int i;
- IRSetCObj *p = obj;
+ IrTcl_SetCObj *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++)
static int do_replaceIndicator (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetCObj *p = obj;
+ IrTcl_SetCObj *p = obj;
+ if (argc <= 0)
+ {
+ p->replaceIndicator = 1;
+ return TCL_OK;
+ }
return get_set_int (&p->replaceIndicator, interp, argc, argv);
}
static int do_queryType (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetCObj *p = obj;
+ IrTcl_SetCObj *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);
static int do_userInformationField (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRObj *p = obj;
-
+ IrTcl_Obj *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;
+ IrTcl_SetCObj *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;
+ IrTcl_SetCObj *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);
+ IrTcl_SetCObj *p = o;
+
+ if (argc <= 0)
+ {
+ p->mediumSetPresentNumber = 0;
+ return TCL_OK;
+ }
+ return get_set_int (&p->mediumSetPresentNumber, interp, argc, argv);
}
+/*
+ * do_referenceId: Set/Get referenceId
+ */
+static int do_referenceId (void *obj, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_SetCObj *p = obj;
-static IRMethod ir_method_tab[] = {
+ if (argc == 0)
+ p->referenceId = NULL;
+ else if (argc == -1)
+ return ir_strdel (interp, &p->referenceId);
+ if (argc == 3)
+ {
+ free (p->referenceId);
+ if (ir_strdup (interp, &p->referenceId, argv[2]) == TCL_ERROR)
+ return TCL_ERROR;
+ }
+ Tcl_AppendResult (interp, p->referenceId, NULL);
+ return TCL_OK;
+}
+
+static IrTcl_Method ir_method_tab[] = {
{ 1, "comstack", do_comstack },
{ 1, "protocol", do_protocol },
{ 0, "failback", do_failback },
{ 0, NULL, NULL}
};
-static IRMethod ir_set_c_method_tab[] = {
+static IrTcl_Method 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, "referenceId", do_referenceId },
{ 0, NULL, NULL}
};
* ir_obj_method: IR Object methods
*/
static int ir_obj_method (ClientData clientData, Tcl_Interp *interp,
-int argc, char **argv)
+ int argc, char **argv)
{
- IRMethods tab[3];
- IRObj *p = clientData;
+ IrTcl_Methods tab[3];
+ IrTcl_Obj *p = clientData;
if (argc < 2)
return ir_method_r (clientData, interp, argc, argv, ir_method_tab);
*/
static void ir_obj_delete (ClientData clientData)
{
- free ( (void*) clientData);
-}
+ IrTcl_Obj *obj = clientData;
+ IrTcl_Methods 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);
}
/*
* ir_obj_mk: IR Object creation
*/
static int ir_obj_mk (ClientData clientData, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
- IRObj *obj;
+ IrTcl_Methods tab[3];
+ IrTcl_Obj *obj;
#if CCL2RPN
FILE *inf;
#endif
}
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->idAuthenticationOpen = NULL;
- obj->idAuthenticationGroupId = NULL;
- obj->idAuthenticationUserId = NULL;
- obj->idAuthenticationPassword = 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")))
fclose (inf);
}
#endif
- 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);
- ODR_MASK_SET (&obj->options, 1);
- ODR_MASK_SET (&obj->options, 7);
- ODR_MASK_SET (&obj->options, 14);
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);
Z_Query query;
Z_APDU apdu, *apdup = &apdu;
Odr_oct ccl_query;
- IRSetObj *obj = o;
- IRObj *p = obj->parent;
+ IrTcl_SetObj *obj = o;
+ IrTcl_Obj *p = obj->parent;
int r;
+ oident bib1;
+
+ if (argc <= 0)
+ return TCL_OK;
p->set_child = o;
if (argc != 3)
interp->result = "wrong # args";
return TCL_ERROR;
}
- if (!p->set_inher.num_databaseNames)
+ if (!obj->set_inher.num_databaseNames)
{
interp->result = "no databaseNames";
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;
+
+ set_referenceId (p->odr_out, &req.referenceId, obj->set_inher.referenceId);
- req.referenceId = 0;
- req.smallSetUpperBound = &p->set_inher.smallSetUpperBound;
- req.largeSetLowerBound = &p->set_inher.largeSetLowerBound;
- req.mediumSetPresentNumber = &p->set_inher.mediumSetPresentNumber;
- req.replaceIndicator = &p->set_inher.replaceIndicator;
+ req.smallSetUpperBound = &obj->set_inher.smallSetUpperBound;
+ req.largeSetLowerBound = &obj->set_inher.largeSetLowerBound;
+ req.mediumSetPresentNumber = &obj->set_inher.mediumSetPresentNumber;
+ req.replaceIndicator = &obj->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;
- for (r=0; r < p->set_inher.num_databaseNames; r++)
- logf (LOG_DEBUG, " Database %s", p->set_inher.databaseNames[r]);
+ req.num_databaseNames = obj->set_inher.num_databaseNames;
+ req.databaseNames = obj->set_inher.databaseNames;
+ for (r=0; r < obj->set_inher.num_databaseNames; r++)
+ logf (LOG_DEBUG, " Database %s", obj->set_inher.databaseNames[r]);
req.smallSetElementSetNames = 0;
req.mediumSetElementSetNames = 0;
req.preferredRecordSyntax = 0;
req.query = &query;
- if (!strcmp (p->set_inher.queryType, "rpn"))
+ if (!strcmp (obj->set_inher.queryType, "rpn"))
{
Z_RPNQuery *RPNquery;
Tcl_AppendResult (interp, "Syntax error in query", NULL);
return TCL_ERROR;
}
- RPNquery->attributeSetId = oid_getoidbyent (&p->bib1);
+ 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"))
+ else if (!strcmp (obj->set_inher.queryType, "cclrpn"))
{
int error;
int pos;
rpn = ccl_find_str(p->bibset, argv[2], &error, &pos);
if (error)
{
- Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg(error),NULL);
+ Tcl_AppendResult (interp, "CCL error: ",
+ ccl_err_msg(error), NULL);
return TCL_ERROR;
}
ccl_pr_tree (rpn, stderr);
fprintf (stderr, "\n");
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;
logf (LOG_DEBUG, "CCLRPN");
}
#endif
- else if (!strcmp (p->set_inher.queryType, "ccl"))
+ else if (!strcmp (obj->set_inher.queryType, "ccl"))
{
query.which = Z_Query_type_2;
query.u.type_2 = &ccl_query;
static int do_resultCount (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&obj->resultCount, interp, argc, argv);
}
static int do_searchStatus (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&obj->searchStatus, interp, argc, argv);
}
static int do_presentStatus (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&obj->presentStatus, interp, argc, argv);
}
static int do_nextResultSetPosition (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);
}
static int do_setName (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *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);
* do_numberOfRecordsReturned: Get number of records returned
*/
static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
+ if (argc < 0)
+ return TCL_OK;
return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
}
/*
- * do_recordType: Return record type (if any) at position.
+ * do_type: Return type (if any) at position.
*/
-static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_type (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
int offset;
- IRRecordList *rl;
+ IrTcl_RecordList *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");
switch (rl->which)
{
case Z_NamePlusRecord_databaseRecord:
- interp->result = "databaseRecord";
+ interp->result = "DB";
break;
case Z_NamePlusRecord_surrogateDiagnostic:
- interp->result = "surrogateDiagnostic";
+ interp->result = "SD";
break;
}
return TCL_OK;
}
/*
- * do_recordDiag: Return diagnostic record info
+ * do_diag: Return diagnostic record info
*/
-static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_diag (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
int offset;
- IRRecordList *rl;
+ IrTcl_RecordList *rl;
char buf[20];
+ const char *cp;
+ if (argc <= 0)
+ return TCL_OK;
if (argc < 3)
{
sprintf (interp->result, "wrong # args");
Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
return TCL_ERROR;
}
+
sprintf (buf, "%d", rl->u.diag.condition);
- Tcl_AppendResult (interp, buf, " {",
- (rl->u.diag.addinfo ? rl->u.diag.addinfo : ""),
- "}", NULL);
+ Tcl_AppendElement (interp, buf);
+ cp = diagbib1_str (rl->u.diag.condition);
+ if (cp)
+ Tcl_AppendElement (interp, (char*) cp);
+ else
+ Tcl_AppendElement (interp, "");
+ if (rl->u.diag.addinfo)
+ Tcl_AppendElement (interp, (char*) rl->u.diag.addinfo);
+ else
+ Tcl_AppendElement (interp, "");
return TCL_OK;
}
*/
static int do_getMarc (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *obj = o;
int offset;
- IRRecordList *rl;
+ IrTcl_RecordList *rl;
- if (argc < 4)
+ if (argc <= 0)
+ return TCL_OK;
+ if (argc < 7)
{
sprintf (interp->result, "wrong # args");
return TCL_ERROR;
static int do_responseStatus (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
+ IrTcl_SetObj *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");
static int do_present (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *obj = o;
- IRObj *p = obj->parent;
+ IrTcl_SetObj *obj = o;
+ IrTcl_Obj *p = obj->parent;
Z_APDU apdu, *apdup = &apdu;
Z_PresentRequest req;
int start;
int number;
int r;
+ if (argc <= 0)
+ return TCL_OK;
if (argc >= 3)
{
if (Tcl_GetInt (interp, argv[2], &start) == TCL_ERROR)
apdu.which = Z_APDU_presentRequest;
apdu.u.presentRequest = &req;
- req.referenceId = 0;
- /* sprintf(setstring, "%d", setnumber); */
+
+ set_referenceId (p->odr_out, &req.referenceId, obj->set_inher.referenceId);
req.resultSetId = obj->setName ? obj->setName : "Default";
static int do_loadFile (void *o, Tcl_Interp *interp,
int argc, char **argv)
{
- IRSetObj *setobj = o;
+ IrTcl_SetObj *setobj = o;
FILE *inf;
size_t size;
int no = 1;
char *buf;
+ if (argc <= 0)
+ return TCL_OK;
if (argc < 3)
{
interp->result = "wrong # args";
}
while ((buf = ir_tcl_fread_marc (inf, &size)))
{
- IRRecordList *rl;
+ IrTcl_RecordList *rl;
rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord);
rl->u.dbrec.buf = buf;
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 IrTcl_Method ir_set_method_tab[] = {
{ 0, "search", do_search },
{ 0, "searchStatus", do_searchStatus },
{ 0, "presentStatus", do_presentStatus },
{ 0, "resultCount", do_resultCount },
{ 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },
{ 0, "present", do_present },
- { 0, "recordType", do_recordType },
+ { 0, "type", do_type },
{ 0, "getMarc", do_getMarc },
- { 0, "Diag", do_recordDiag },
+ { 0, "diag", do_diag },
{ 0, "responseStatus", do_responseStatus },
{ 0, "loadFile", do_loadFile },
{ 0, NULL, NULL}
- };
- IRMethods tabs[3];
- IRSetObj *p = clientData;
+};
+
+/*
+ * ir_set_obj_method: IR Set Object methods
+ */
+static int ir_set_obj_method (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_Methods tabs[3];
+ IrTcl_SetObj *p = clientData;
if (argc < 2)
{
interp->result = "wrong # args";
return TCL_ERROR;
}
- tabs[0].tab = tab;
+ 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;
*/
static void ir_set_obj_delete (ClientData clientData)
{
- free ( (void*) clientData);
+ IrTcl_Methods tabs[3];
+ IrTcl_SetObj *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)
{
- IRSetObj *obj;
+ IrTcl_Methods tabs[3];
+ IrTcl_SetObj *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;
int i;
- IRSetCObj *dst;
- IRSetCObj *src;
+ IrTcl_SetCObj *dst;
+ IrTcl_SetCObj *src;
if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))
{
interp->result = "No parent";
return TCL_ERROR;
}
- if (!(obj = ir_malloc (interp, sizeof(*obj))))
- return TCL_ERROR;
- obj->parent = (IRObj *) parent_info.clientData;
+ obj->parent = (IrTcl_Obj *) parent_info.clientData;
dst = &obj->set_inher;
src = &obj->parent->set_inher;
if (ir_strdup (interp, &dst->queryType, src->queryType)
== TCL_ERROR)
return TCL_ERROR;
+
+ if (ir_strdup (interp, &dst->referenceId, src->referenceId)
+ == TCL_ERROR)
+ return TCL_ERROR;
+ dst->replaceIndicator = src->replaceIndicator;
dst->smallSetUpperBound = src->smallSetUpperBound;
dst->largeSetLowerBound = src->largeSetLowerBound;
dst->mediumSetPresentNumber = src->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_ScanRequest req;
Z_APDU apdu, *apdup = &apdu;
- IRScanObj *obj = o;
- IRObj *p = obj->parent;
+ IrTcl_ScanObj *obj = o;
+ IrTcl_Obj *p = obj->parent;
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)
{
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;
+ set_referenceId (p->odr_out, &req.referenceId, p->set_inher.referenceId);
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 !CCL2RPN
if (!(req.termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
static int do_stepSize (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
+ if (argc <= 0)
+ {
+ p->stepSize = 0;
+ return TCL_OK;
+ }
return get_set_int (&p->stepSize, interp, argc, argv);
}
static int do_numberOfTermsRequested (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->numberOfTermsRequested = 20;
+ return TCL_OK;
+ }
return get_set_int (&p->numberOfTermsRequested, interp, argc, argv);
}
static int do_preferredPositionInResponse (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->preferredPositionInResponse = 1;
+ return TCL_OK;
+ }
return get_set_int (&p->preferredPositionInResponse, interp, argc, argv);
}
static int do_scanStatus (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->scanStatus, interp, argc, argv);
}
static int do_numberOfEntriesReturned (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->numberOfEntriesReturned, interp, argc, argv);
}
static int do_positionOfTerm (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
+
+ if (argc <= 0)
+ return TCL_OK;
return get_set_int (&p->positionOfTerm, interp, argc, argv);
}
*/
static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv)
{
- IRScanObj *p = obj;
+ IrTcl_ScanObj *p = obj;
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 IrTcl_Method 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}
- };
- IRMethods tabs[3];
+};
+
+/*
+ * ir_scan_obj_method: IR Scan Object methods
+ */
+static int ir_scan_obj_method (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_Methods tabs[2];
if (argc < 2)
{
interp->result = "wrong # args";
return TCL_ERROR;
}
-
- tabs[0].tab = tab;
+ tabs[0].tab = ir_scan_method_tab;
tabs[0].obj = clientData;
tabs[1].tab = NULL;
*/
static void ir_scan_obj_delete (ClientData clientData)
{
- free ( (void*) clientData);
+ IrTcl_Methods tabs[2];
+ IrTcl_ScanObj *obj = clientData;
+
+ tabs[0].tab = ir_scan_method_tab;
+ tabs[0].obj = obj;
+ tabs[1].tab = NULL;
+
+ ir_method (NULL, -1, NULL, tabs);
+ free (obj);
}
/*
int argc, char **argv)
{
Tcl_CmdInfo parent_info;
- IRScanObj *obj;
+ IrTcl_ScanObj *obj;
+ IrTcl_Methods tabs[2];
- if (argc != 2)
+ if (argc != 3)
{
interp->result = "wrong # args";
return TCL_ERROR;
}
- if (get_parent_info (interp, argv[1], &parent_info, NULL) == TCL_ERROR)
- return TCL_ERROR;
+ if (!Tcl_GetCommandInfo (interp, argv[2], &parent_info))
+ {
+ interp->result = "No parent";
+ return TCL_ERROR;
+ }
if (!(obj = ir_malloc (interp, sizeof(*obj))))
return TCL_ERROR;
- obj->stepSize = 0;
- obj->numberOfTermsRequested = 20;
- obj->preferredPositionInResponse = 1;
+ obj->parent = (IrTcl_Obj *) parent_info.clientData;
- obj->entries = NULL;
- obj->nonSurrogateDiagnostics = NULL;
+ tabs[0].tab = ir_scan_method_tab;
+ tabs[0].obj = obj;
+ tabs[1].tab = NULL;
- obj->parent = (IRObj *) parent_info.clientData;
+ if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)
+ return TCL_ERROR;
Tcl_CreateCommand (interp, argv[1], ir_scan_obj_method,
(ClientData) obj, ir_scan_obj_delete);
return TCL_OK;
static void ir_initResponse (void *obj, Z_InitResponse *initrs)
{
- IRObj *p = obj;
+ IrTcl_Obj *p = obj;
p->initResult = *initrs->result ? 1 : 0;
if (!*initrs->result)
else
logf (LOG_DEBUG, "Connection accepted by target");
+ get_referenceId (&p->set_inher.referenceId, initrs->referenceId);
+
free (p->targetImplementationId);
ir_strdup (p->interp, &p->targetImplementationId,
initrs->implementationId);
static void ir_handleRecords (void *o, Z_Records *zrs)
{
- IRObj *p = o;
- IRSetObj *setobj = p->set_child;
+ IrTcl_Obj *p = o;
+ IrTcl_SetObj *setobj = p->set_child;
setobj->which = zrs->which;
setobj->recordFlag = 1;
else
{
int offset;
- IRRecordList *rl;
+ IrTcl_RecordList *rl;
setobj->numberOfRecordsReturned =
zrs->u.databaseOrSurDiagnostics->num_records;
static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
{
- IRObj *p = o;
- IRSetObj *setobj = p->set_child;
+ IrTcl_Obj *p = o;
+ IrTcl_SetObj *setobj = p->set_child;
Z_Records *zrs = searchrs->records;
- if (setobj)
+ logf (LOG_DEBUG, "Received search response");
+ if (!setobj)
{
- setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
- setobj->resultCount = *searchrs->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
logf (LOG_DEBUG, "Search response, no object!");
+ return;
+ }
+ setobj->searchStatus = searchrs->searchStatus ? 1 : 0;
+ get_referenceId (&setobj->set_inher.referenceId, searchrs->referenceId);
+ setobj->resultCount = *searchrs->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;
}
static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
{
- IRObj *p = o;
- IRSetObj *setobj = p->set_child;
+ IrTcl_Obj *p = o;
+ IrTcl_SetObj *setobj = p->set_child;
Z_Records *zrs = presrs->records;
- logf (LOG_DEBUG, "Received presentResponse");
+ logf (LOG_DEBUG, "Received present response");
+ if (!setobj)
+ {
+ logf (LOG_DEBUG, "Present response, no object!");
+ return;
+ }
setobj->presentStatus = *presrs->presentStatus;
+ get_referenceId (&setobj->set_inher.referenceId, presrs->referenceId);
setobj->nextResultSetPosition = *presrs->nextResultSetPosition;
if (zrs)
ir_handleRecords (o, zrs);
static void ir_scanResponse (void *o, Z_ScanResponse *scanrs)
{
- IRObj *p = o;
- IRScanObj *scanobj = p->scan_child;
+ IrTcl_Obj *p = o;
+ IrTcl_ScanObj *scanobj = p->scan_child;
logf (LOG_DEBUG, "Received scanResponse");
+ get_referenceId (&p->set_inher.referenceId, scanrs->referenceId);
scanobj->scanStatus = *scanrs->scanStatus;
logf (LOG_DEBUG, "scanStatus=%d", scanobj->scanStatus);
*/
void ir_select_read (ClientData clientData)
{
- IRObj *p = clientData;
+ IrTcl_Obj *p = clientData;
Z_APDU *apdu;
int r;
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
{
+ /* 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)
{
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)
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);
+
+ /* release ir object now if callback deleted it */
+ ir_obj_delete (p);
return;
}
switch(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);
+ if (p->ref_count == 1)
+ {
+ ir_obj_delete (p);
+ return;
+ }
+ --(p->ref_count);
} while (p->cs_link && cs_more (p->cs_link));
}
*/
void ir_select_write (ClientData clientData)
{
- IRObj *p = clientData;
+ IrTcl_Obj *p = clientData;
int r;
logf (LOG_DEBUG, "In write handler");
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);
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