* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.37 1995-06-01 07:31:20 adam
+ * Revision 1.51 1995-08-03 13:22:54 adam
+ * Request queue.
+ *
+ * Revision 1.50 1995/07/20 08:09:49 adam
+ * client.tcl: Targets removed from hotTargets list when targets
+ * are removed/modified.
+ * ir-tcl.c: More work on triggerResourceControl.
+ *
+ * Revision 1.49 1995/06/30 12:39:21 adam
+ * Bug fix: loadFile didn't set record type.
+ * The MARC routines are a little less strict in the interpretation.
+ * Script display.tcl replaces the old marc.tcl.
+ * New interactive script: shell.tcl.
+ *
+ * Revision 1.48 1995/06/27 19:03:50 adam
+ * Bug fix in do_present in ir-tcl.c: p->set_child member weren't set.
+ * nextResultSetPosition used instead of setOffset.
+ *
+ * Revision 1.47 1995/06/25 10:25:04 adam
+ * Working on triggerResourceControl. Description of compile/install
+ * procedure moved to ir-tcl.sgml.
+ *
+ * Revision 1.46 1995/06/22 13:15:06 adam
+ * Feature: SUTRS. Setting getSutrs implemented.
+ * Work on display formats.
+ * Preferred record syntax can be set by the user.
+ *
+ * Revision 1.45 1995/06/20 08:07:30 adam
+ * New setting: failInfo.
+ * Working on better cancel mechanism.
+ *
+ * Revision 1.44 1995/06/19 17:01:20 adam
+ * Minor changes.
+ *
+ * Revision 1.43 1995/06/19 13:06:08 adam
+ * New define: IR_TCL_VERSION.
+ *
+ * Revision 1.42 1995/06/19 08:08:52 adam
+ * client.tcl: hotTargets now contain both database and target name.
+ * ir-tcl.c: setting protocol edited. Errors in callbacks are logged
+ * by logf(LOG_WARN, ...) calls.
+ *
+ * Revision 1.41 1995/06/16 12:28:16 adam
+ * Implemented preferredRecordSyntax.
+ * Minor changes in diagnostic handling.
+ * Record list deleted when connection closes.
+ *
+ * Revision 1.40 1995/06/14 13:37:18 adam
+ * Setting recordType implemented.
+ * Setting implementationVersion implemented.
+ * Settings implementationId / implementationName edited.
+ *
+ * Revision 1.39 1995/06/08 10:26:32 adam
+ * Bug fix in ir_strdup.
+ *
+ * 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
IrTcl_Method *tab;
} IrTcl_Methods;
+static Tcl_Interp *irTcl_interp;
+
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);
static int do_disconnect (void *obj, Tcl_Interp *interp,
int argc, char **argv);
rl->u.dbrec.buf = NULL;
break;
case Z_NamePlusRecord_surrogateDiagnostic:
- free (rl->u.diag.addinfo);
- rl->u.diag.addinfo = NULL;
+ ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+ &rl->u.surrogateDiagnostics.num);
break;
}
break;
return rl;
}
+static struct {
+ enum oid_value value;
+ const char *name;
+} IrTcl_recordSyntaxTab[] = {
+{ VAL_UNIMARC, "UNIMARC" },
+{ VAL_INTERMARC, "INTERMARC" },
+{ VAL_CCF, "CCF" },
+{ VAL_USMARC, "USMARC" },
+{ VAL_UKMARC, "UKMARC" },
+{ VAL_NORMARC, "NORMARC" },
+{ VAL_LIBRISMARC, "LIBRISMARC" },
+{ VAL_DANMARC, "DANMARC" },
+{ VAL_FINMARC, "FINMARC" },
+{ VAL_MAB, "MAB" },
+{ VAL_CANMARC, "CANMARC" },
+{ VAL_SBN, "SBN" },
+{ VAL_PICAMARC, "PICAMARC" },
+{ VAL_AUSMARC, "AUSMARC" },
+{ VAL_IBERMARC, "IBERMARC" },
+{ VAL_SUTRS, "SUTRS" },
+{ 0, NULL }
+};
+
+/*
+ * IrTcl_eval
+ */
+int IrTcl_eval (Tcl_Interp *interp, const char *command)
+{
+ char *tmp = malloc (strlen(command)+1);
+ int r;
+
+ if (!tmp)
+ {
+ logf (LOG_FATAL, "Out of memory in IrTcl_eval");
+ exit (1);
+ }
+ strcpy (tmp, command);
+ r = Tcl_Eval (interp, tmp);
+ if (r == TCL_ERROR)
+ logf (LOG_WARN, "Tcl error in line %d: %s", interp->errorLine,
+ interp->result);
+ Tcl_FreeResult (interp);
+ free (tmp);
+ return r;
+}
+
+/*
+ * IrTcl_getRecordSyntaxStr: Return record syntax name of object id
+ */
+static const char *IrTcl_getRecordSyntaxStr (enum oid_value value)
+{
+ int i;
+ for (i = 0; IrTcl_recordSyntaxTab[i].name; i++)
+ if (IrTcl_recordSyntaxTab[i].value == value)
+ return IrTcl_recordSyntaxTab[i].name;
+ return "USMARC";
+}
+
+/*
+ * IrTcl_getRecordSyntaxVal: Return record syntax value of string
+ */
+static enum oid_value IrTcl_getRecordSyntaxVal (const char *name)
+{
+ int i;
+ for (i = 0; IrTcl_recordSyntaxTab[i].name; i++)
+ if (!strcmp (IrTcl_recordSyntaxTab[i].name, name))
+ return IrTcl_recordSyntaxTab[i].value;
+ return 0;
+}
+
static IrTcl_RecordList *find_IR_record (IrTcl_SetObj *setobj, int no)
{
IrTcl_RecordList *rl;
free (rl->u.dbrec.buf);
break;
case Z_NamePlusRecord_surrogateDiagnostic:
- free (rl->u.diag.addinfo);
+ ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+ &rl->u.surrogateDiagnostics.num);
break;
}
rl1 = rl->next;
}
/*
- * getsetint: Set/get integer value
+ * get_set_int: Set/get integer value
*/
static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
{
}
/*
- * 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;
-}
-
-/*
* ir_method: Search for method in table and invoke method handler
*/
int ir_method (Tcl_Interp *interp, int argc, char **argv, IrTcl_Methods *tab)
if (argc <= 0)
return TCL_OK;
- Tcl_AppendResult (interp, "Bad method. Possible methods:", NULL);
+ Tcl_AppendResult (interp, "Bad method: ", argv[1],
+ ". 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);
*/
int ir_strdup (Tcl_Interp *interp, char** p, const char *s)
{
+ if (!s)
+ {
+ *p = NULL;
+ return TCL_OK;
+ }
*p = malloc (strlen(s)+1);
if (!*p)
{
/* ------------------------------------------------------- */
+#if 0
+/*
+ * ir-tcl_send_APDU: send APDU
+ */
+static int ir_tcl_send_APDU (Tcl_Interp *interp, IrTcl_Obj *p, Z_APDU *apdu,
+ const char *msg)
+{
+ int r;
+
+ if (!z_APDU (p->odr_out, &apdu, 0))
+ {
+ Tcl_AppendResult (interp, odr_errlist [odr_geterror (p->odr_out)],
+ NULL);
+ odr_reset (p->odr_out);
+ return TCL_ERROR;
+ }
+ p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
+ odr_reset (p->odr_out);
+ if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
+ {
+ sprintf (interp->result, "cs_put failed in %s", msg);
+ do_disconnect (p, NULL, 2, NULL);
+ return TCL_ERROR;
+ }
+ else if (r == 1)
+ {
+ ir_select_add_write (cs_fileno(p->cs_link), p);
+ logf (LOG_DEBUG, "Sent part of %s (%d bytes)", msg, p->slen);
+ }
+ else
+ logf (LOG_DEBUG, "Sent whole %s (%d bytes)", msg, p->slen);
+ return TCL_OK;
+}
+#endif
+
/*
* do_init_request: init method on IR object
*/
static int do_init_request (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- Z_APDU apdu, *apdup = &apdu;
+ Z_APDU *apdu;
IrTcl_Obj *p = obj;
- Z_InitRequest req;
- int r;
+ Z_InitRequest *req;
if (argc <= 0)
return TCL_OK;
interp->result = "not connected";
return TCL_ERROR;
}
- odr_reset (p->odr_out);
+ apdu = zget_APDU (p->odr_out, Z_APDU_initRequest);
+ req = apdu->u.initRequest;
- set_referenceId (p->odr_out, &req.referenceId, p->set_inher.referenceId);
- req.options = &p->options;
- req.protocolVersion = &p->protocolVersion;
- req.preferredMessageSize = &p->preferredMessageSize;
- req.maximumRecordSize = &p->maximumRecordSize;
+ set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);
+ req->options = &p->options;
+ req->protocolVersion = &p->protocolVersion;
+ req->preferredMessageSize = &p->preferredMessageSize;
+ req->maximumRecordSize = &p->maximumRecordSize;
if (p->idAuthenticationGroupId)
{
pass->password = p->idAuthenticationPassword;
else
pass->password = NULL;
- req.idAuthentication = auth;
+ req->idAuthentication = auth;
}
else if (!p->idAuthenticationOpen || !*p->idAuthenticationOpen)
- req.idAuthentication = NULL;
+ 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->idAuthentication = auth;
}
- req.implementationId = p->implementationId;
- req.implementationName = p->implementationName;
- req.implementationVersion = "0.1";
- req.userInformationField = 0;
+ req->implementationId = p->implementationId;
+ req->implementationName = p->implementationName;
+ req->implementationVersion = p->implementationVersion;
+ req->userInformationField = 0;
- apdu.u.initRequest = &req;
- apdu.which = Z_APDU_initRequest;
-
- if (!z_APDU (p->odr_out, &apdup, 0))
- {
- Tcl_AppendResult (interp, odr_errlist [odr_geterror (p->odr_out)],
- NULL);
- odr_reset (p->odr_out);
- return TCL_ERROR;
- }
- p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
- if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
- {
- interp->result = "cs_put failed in init";
- do_disconnect (p, NULL, 2, NULL);
- return TCL_ERROR;
- }
- else if (r == 1)
- {
- ir_select_add_write (cs_fileno(p->cs_link), p);
- logf (LOG_DEBUG, "Sent part of initializeRequest (%d bytes)", p->slen);
- }
- else
- logf (LOG_DEBUG, "Sent whole initializeRequest (%d bytes)", p->slen);
- return TCL_OK;
+ return ir_tcl_send_APDU (interp, p, apdu, "init");
}
/*
static int do_protocolVersion (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- static struct ir_named_entry version_tab[] = {
- { "1", 0 },
- { "2", 1 },
- { "3", 2 },
- { "4", 3 },
- { NULL,0}
- };
+ int version, i;
+ char buf[10];
IrTcl_Obj *p = obj;
if (argc <= 0)
ODR_MASK_SET (&p->protocolVersion, 1);
return TCL_OK;
}
- return ir_named_bits (version_tab, &p->protocolVersion,
- interp, argc-2, argv+2);
+ if (argc == 3)
+ {
+ if (Tcl_GetInt (interp, argv[2], &version)==TCL_ERROR)
+ return TCL_ERROR;
+ ODR_MASK_ZERO (&p->protocolVersion);
+ for (i = 0; i<version; i++)
+ ODR_MASK_SET (&p->protocolVersion, i);
+ }
+ for (i = 4; --i >= 0; )
+ if (ODR_MASK_GET (&p->protocolVersion, i))
+ break;
+ sprintf (buf, "%d", i+1);
+ interp->result = buf;
+ return TCL_OK;
}
/*
{ "accessCtrl", 6},
{ "scan", 7},
{ "sort", 8},
- { "extentedServices", 10},
+ { "extendedServices", 10},
{ "level-1Segmentation", 11},
{ "level-2Segmentation", 12},
{ "concurrentOperations", 13},
ODR_MASK_ZERO (&p->options);
ODR_MASK_SET (&p->options, 0);
ODR_MASK_SET (&p->options, 1);
+ ODR_MASK_SET (&p->options, 4);
ODR_MASK_SET (&p->options, 7);
ODR_MASK_SET (&p->options, 14);
return TCL_OK;
}
/*
+ * do_failInfo: Get fail information
+ */
+static int do_failInfo (void *obj, Tcl_Interp *interp, int argc, char **argv)
+{
+ char buf[16], *cp;
+ IrTcl_Obj *p = obj;
+
+ if (argc <= 0)
+ {
+ p->failInfo = 0;
+ return TCL_OK;
+ }
+ sprintf (buf, "%d", p->failInfo);
+ switch (p->failInfo)
+ {
+ case 0:
+ cp = "ok";
+ break;
+ case IR_TCL_FAIL_CONNECT:
+ cp = "connect failed";
+ break;
+ case IR_TCL_FAIL_READ:
+ cp = "connection closed";
+ break;
+ case IR_TCL_FAIL_WRITE:
+ cp = "connection closed";
+ break;
+ case IR_TCL_FAIL_IN_APDU:
+ cp = "failed to decode incoming APDU";
+ break;
+ case IR_TCL_FAIL_UNKNOWN_APDU:
+ cp = "unknown APDU";
+ break;
+ default:
+ cp = "";
+ }
+ Tcl_AppendElement (interp, buf);
+ Tcl_AppendElement (interp, cp);
+ return TCL_OK;
+}
+
+/*
* do_preferredMessageSize: Set/get preferred message size
*/
static int do_preferredMessageSize (void *obj, Tcl_Interp *interp,
if (argc <= 0)
{
- p->preferredMessageSize = 4096;
+ p->preferredMessageSize = 30000;
return TCL_OK;
}
return get_set_int (&p->preferredMessageSize, interp, argc, argv);
if (argc <= 0)
{
- p->maximumRecordSize = 32768;
+ p->maximumRecordSize = 30000;
return TCL_OK;
}
return get_set_int (&p->maximumRecordSize, interp, argc, argv);
IrTcl_Obj *p = obj;
if (argc == 0)
- return ir_strdup (interp, &p->implementationName, "TCL/TK on YAZ");
+ return ir_strdup (interp, &p->implementationName,
+ "Index Data/IrTcl on YAZ");
else if (argc == -1)
return ir_strdel (interp, &p->implementationName);
if (argc == 3)
}
/*
- * do_implementationId: Set/get Implementation Id.
+ * do_implementationId: Get Implementation Id.
*/
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");
+ return ir_strdup (interp, &p->implementationId, "YAZ (id=81)");
else if (argc == -1)
return ir_strdel (interp, &p->implementationId);
- if (argc == 3)
- {
- free (p->implementationId);
- if (ir_strdup (interp, &p->implementationId, argv[2]) == TCL_ERROR)
- return TCL_ERROR;
- }
Tcl_AppendResult (interp, p->implementationId, (char*) NULL);
return TCL_OK;
}
/*
+ * do_implementationVersion: get Implementation Version.
+ */
+static int do_implementationVersion (void *obj, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_Obj *p = obj;
+
+ if (argc == 0)
+ return ir_strdup (interp, &p->implementationVersion,
+ "YAZ: " YAZ_VERSION " / IrTcl: " IR_TCL_VERSION);
+ else if (argc == -1)
+ return ir_strdel (interp, &p->implementationVersion);
+ Tcl_AppendResult (interp, p->implementationVersion, (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)
{
IrTcl_Obj *p = obj;
-
+
if (argc == 0)
{
p->targetImplementationName = NULL;
void *addr;
IrTcl_Obj *p = obj;
int r;
- int protocol_type = PROTO_Z3950;
if (argc <= 0)
return TCL_OK;
interp->result = "already connected";
return TCL_ERROR;
}
- if (!strcmp (p->protocol_type, "Z3950"))
- protocol_type = PROTO_Z3950;
- else if (!strcmp (p->protocol_type, "SR"))
- protocol_type = PROTO_SR;
- else
- {
- interp->result = "bad protocol type";
- return TCL_ERROR;
- }
if (!strcmp (p->cs_type, "tcpip"))
{
- p->cs_link = cs_create (tcpip_type, CS_BLOCK, protocol_type);
+ p->cs_link = cs_create (tcpip_type, CS_BLOCK, p->protocol_type);
addr = tcpip_strtoaddr (argv[2]);
if (!addr)
{
}
logf (LOG_DEBUG, "tcp/ip connect %s", argv[2]);
}
-#if MOSI
else if (!strcmp (p->cs_type, "mosi"))
{
- p->cs_link = cs_create (mosi_type, CS_BLOCK, protocol_type);
+#if MOSI
+ p->cs_link = cs_create (mosi_type, CS_BLOCK, p->protocol_type);
addr = mosi_strtoaddr (argv[2]);
if (!addr)
{
return TCL_ERROR;
}
logf (LOG_DEBUG, "mosi connect %s", argv[2]);
- }
+#else
+ interp->result = "MOSI support not there";
+ return TCL_ERROR;
#endif
+ }
else
{
- interp->result = "unknown comstack type";
+ Tcl_AppendResult (interp, "Bad comstack type: ",
+ p->cs_type, NULL);
return TCL_ERROR;
}
if (ir_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
return TCL_ERROR;
if ((r=cs_connect (p->cs_link, addr)) < 0)
{
- interp->result = "cs_connect fail";
+ interp->result = "connect fail";
do_disconnect (p, NULL, 2, NULL);
return TCL_ERROR;
}
if (r == 1)
{
ir_select_add_write (cs_fileno (p->cs_link), p);
- p->connectFlag = 1;
+ p->state = IR_TCL_R_Connecting;
}
else
{
- p->connectFlag = 0;
+ p->state = IR_TCL_R_Idle;
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
}
}
- if (p->hostname)
- Tcl_AppendElement (interp, p->hostname);
return TCL_OK;
}
if (argc == 0)
{
- p->connectFlag = 0;
+ p->state = IR_TCL_R_Idle;
p->hostname = NULL;
p->cs_link = NULL;
return TCL_OK;
assert (p->cs_link);
cs_close (p->cs_link);
p->cs_link = NULL;
+
+ ODR_MASK_ZERO (&p->options);
+ ODR_MASK_SET (&p->options, 0);
+ ODR_MASK_SET (&p->options, 1);
+ ODR_MASK_SET (&p->options, 4);
+ ODR_MASK_SET (&p->options, 7);
+ ODR_MASK_SET (&p->options, 14);
+
+ ODR_MASK_ZERO (&p->protocolVersion);
+ ODR_MASK_SET (&p->protocolVersion, 0);
+ ODR_MASK_SET (&p->protocolVersion, 1);
}
assert (!p->cs_link);
return TCL_OK;
return TCL_OK;
}
-/*
- * do_protocol: Set/get protocol method on IR object
- */
-static int do_protocol (void *o, Tcl_Interp *interp,
- int argc, char **argv)
-{
- IrTcl_Obj *obj = o;
-
- 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)
- return TCL_ERROR;
- }
- Tcl_AppendElement (interp, obj->protocol_type);
- return TCL_OK;
-}
/*
* do_callback: add callback
}
/*
+ * do_protocol: Set/get protocol method on IR object
+ */
+static int do_protocol (void *o, Tcl_Interp *interp, int argc, char **argv)
+{
+ IrTcl_Obj *p = o;
+
+ if (argc <= 0)
+ {
+ p->protocol_type = PROTO_Z3950;
+ return TCL_OK;
+ }
+ else if (argc == 3)
+ {
+ if (!strcmp (argv[2], "Z39"))
+ p->protocol_type = PROTO_Z3950;
+ else if (!strcmp (argv[2], "SR"))
+ p->protocol_type = PROTO_SR;
+ else
+ {
+ Tcl_AppendResult (interp, "Bad protocol: ", argv[2], NULL);
+ return TCL_ERROR;
+ }
+ return TCL_OK;
+ }
+ switch (p->protocol_type)
+ {
+ case PROTO_Z3950:
+ Tcl_AppendElement (interp, "Z39");
+ break;
+ case PROTO_SR:
+ Tcl_AppendElement (interp, "SR");
+ break;
+ }
+ return TCL_OK;
+}
+
+/*
+ * do_triggerResourceControl:
+ */
+static int do_triggerResourceControl (void *obj, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_Obj *p = obj;
+ Z_APDU *apdu;
+ Z_TriggerResourceControlRequest *req;
+ bool_t is_false = 0;
+
+ if (argc <= 0)
+ return TCL_OK;
+ if (!p->cs_link)
+ {
+ interp->result = "not connected";
+ return TCL_ERROR;
+ }
+ apdu = zget_APDU (p->odr_out, Z_APDU_triggerResourceControlRequest);
+ req = apdu->u.triggerResourceControlRequest;
+ *req->requestedAction = Z_TriggerResourceCtrl_cancel;
+ req->resultSetWanted = &is_false;
+
+ return ir_tcl_send_APDU (interp, p, apdu, "triggerResourceControl");
+}
+
+/*
* do_databaseNames: specify database names
*/
static int do_databaseNames (void *obj, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
int i;
IrTcl_SetCObj *p = obj;
IrTcl_SetCObj *p = obj;
if (argc == 0)
+ {
p->referenceId = NULL;
+ return TCL_OK;
+ }
else if (argc == -1)
return ir_strdel (interp, &p->referenceId);
if (argc == 3)
return TCL_OK;
}
+/*
+ * do_preferredRecordSyntax: Set/get preferred record syntax
+ */
+static int do_preferredRecordSyntax (void *obj, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_SetCObj *p = obj;
+
+ if (argc == 0)
+ {
+ p->preferredRecordSyntax = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ {
+ free (p->preferredRecordSyntax);
+ p->preferredRecordSyntax = NULL;
+ return TCL_OK;
+ }
+ if (argc == 3)
+ {
+ free (p->preferredRecordSyntax);
+ p->preferredRecordSyntax = NULL;
+ if (argv[2][0] && (p->preferredRecordSyntax =
+ malloc (sizeof(*p->preferredRecordSyntax))))
+ *p->preferredRecordSyntax = IrTcl_getRecordSyntaxVal (argv[2]);
+ }
+ return TCL_OK;
+
+}
static IrTcl_Method ir_method_tab[] = {
{ 1, "comstack", do_comstack },
{ 1, "protocol", do_protocol },
{ 0, "failback", do_failback },
+{ 0, "failInfo", do_failInfo },
{ 1, "connect", do_connect },
{ 0, "protocolVersion", do_protocolVersion },
{ 1, "maximumRecordSize", do_maximumRecordSize },
{ 1, "implementationName", do_implementationName },
{ 1, "implementationId", do_implementationId },
+{ 1, "implementationVersion", do_implementationVersion },
{ 0, "targetImplementationName", do_targetImplementationName },
{ 0, "targetImplementationId", do_targetImplementationId },
{ 0, "targetImplementationVersion", do_targetImplementationVersion },
{ 0, "initResult", do_initResult },
{ 0, "disconnect", do_disconnect },
{ 0, "callback", do_callback },
+{ 0, "triggerResourceControl", do_triggerResourceControl },
{ 0, NULL, NULL}
};
{ 0, "databaseNames", do_databaseNames},
{ 0, "replaceIndicator", do_replaceIndicator},
{ 0, "queryType", do_queryType },
+{ 0, "preferredRecordSyntax", do_preferredRecordSyntax },
{ 0, "smallSetUpperBound", do_smallSetUpperBound},
{ 0, "largeSetLowerBound", do_largeSetLowerBound},
{ 0, "mediumSetPresentNumber", do_mediumSetPresentNumber},
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);
}
obj->odr_in = odr_createmem (ODR_DECODE);
obj->odr_out = odr_createmem (ODR_ENCODE);
obj->odr_pr = odr_createmem (ODR_PRINT);
-
- obj->len_out = 10000;
- if (!(obj->buf_out = ir_malloc (interp, obj->len_out)))
- return TCL_ERROR;
- odr_setbuf (obj->odr_out, obj->buf_out, obj->len_out, 0);
+ obj->state = IR_TCL_R_Idle;
obj->len_in = 0;
obj->buf_in = NULL;
+ obj->request_queue = NULL;
tab[0].tab = ir_method_tab;
tab[0].obj = obj;
/*
* do_search: Do search request
*/
-static int do_search (void *o, Tcl_Interp *interp,
- int argc, char **argv)
+static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- Z_SearchRequest req;
+ Z_SearchRequest *req;
Z_Query query;
- Z_APDU apdu, *apdup = &apdu;
+ Z_APDU *apdu;
Odr_oct ccl_query;
IrTcl_SetObj *obj = o;
- IrTcl_Obj *p = obj->parent;
+ IrTcl_Obj *p;
int r;
oident bib1;
if (argc <= 0)
return TCL_OK;
+ p = obj->parent;
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;
+ apdu = zget_APDU (p->odr_out, Z_APDU_searchRequest);
+ req = apdu->u.searchRequest;
+
+ bib1.proto = p->protocol_type;
bib1.class = CLASS_ATTSET;
bib1.value = VAL_BIB1;
- set_referenceId (p->odr_out, &req.referenceId, obj->set_inher.referenceId);
-
- 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 = obj->set_inher.num_databaseNames;
- req.databaseNames = obj->set_inher.databaseNames;
+ set_referenceId (p->odr_out, &req->referenceId,
+ obj->set_inher.referenceId);
+
+ 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 = 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;
+ req->smallSetElementSetNames = 0;
+ req->mediumSetElementSetNames = 0;
+ if (obj->set_inher.preferredRecordSyntax)
+ {
+ struct oident ident;
+
+ ident.proto = p->protocol_type;
+ ident.class = CLASS_RECSYN;
+ ident.value = *obj->set_inher.preferredRecordSyntax;
+ logf (LOG_DEBUG, "Preferred record syntax is %d", ident.value);
+ req->preferredRecordSyntax = odr_oiddup (p->odr_out,
+ oid_getoidbyent (&ident));
+ }
+ else
+ req->preferredRecordSyntax = 0;
+ req->query = &query;
if (!strcmp (obj->set_inher.queryType, "rpn"))
{
interp->result = "unknown query method";
return TCL_ERROR;
}
- if (!z_APDU (p->odr_out, &apdup, 0))
- {
- interp->result = odr_errlist [odr_geterror (p->odr_out)];
- odr_reset (p->odr_out);
- return TCL_ERROR;
- }
- p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
- if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
- {
- interp->result = "cs_put failed in search";
- return TCL_ERROR;
- }
- else if (r == 1)
- {
- ir_select_add_write (cs_fileno(p->cs_link), p);
- logf (LOG_DEBUG, "Sent part of searchRequest (%d bytes)", p->slen);
- }
- else
- {
- logf (LOG_DEBUG, "Whole search request (%d bytes)", p->slen);
- }
- return TCL_OK;
+ return ir_tcl_send_APDU (interp, p, apdu, "search");
}
/*
IrTcl_SetObj *obj = o;
if (argc <= 0)
+ {
+ obj->nextResultSetPosition = 0;
return TCL_OK;
+ }
return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);
}
* do_numberOfRecordsReturned: Get number of records returned
*/
static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
IrTcl_SetObj *obj = o;
- if (argc < 0)
+ if (argc <= 0)
+ {
+ obj->numberOfRecordsReturned = 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)
{
IrTcl_SetObj *obj = o;
int offset;
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_recordType: Return record type (if any) at position.
*/
-static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
{
IrTcl_SetObj *obj = o;
int offset;
IrTcl_RecordList *rl;
+
+ if (argc == 0)
+ {
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ {
+ return TCL_OK;
+ }
+ if (argc < 3)
+ {
+ sprintf (interp->result, "wrong # args");
+ return TCL_ERROR;
+ }
+ if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
+ return TCL_ERROR;
+ rl = find_IR_record (obj, offset);
+ if (!rl)
+ return TCL_OK;
+ if (rl->which != Z_NamePlusRecord_databaseRecord)
+ {
+ Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
+ return TCL_ERROR;
+ }
+ Tcl_AppendElement (interp, (char*)
+ IrTcl_getRecordSyntaxStr (rl->u.dbrec.type));
+ return TCL_OK;
+}
+
+/*
+ * ir_diagResult
+ */
+static int ir_diagResult (Tcl_Interp *interp, IrTcl_Diagnostic *list, int num)
+{
char buf[20];
+ int i;
+ const char *cp;
+
+ for (i = 0; i<num; i++)
+ {
+ logf (LOG_DEBUG, "Diagnostic, code %d", list[i].condition);
+ sprintf (buf, "%d", list[i].condition);
+ Tcl_AppendElement (interp, buf);
+ cp = diagbib1_str (list[i].condition);
+ if (cp)
+ Tcl_AppendElement (interp, (char*) cp);
+ else
+ Tcl_AppendElement (interp, "");
+ if (list[i].addinfo)
+ Tcl_AppendElement (interp, (char*) list[i].addinfo);
+ else
+ Tcl_AppendElement (interp, "");
+ }
+ return TCL_OK;
+}
+
+/*
+ * do_diag: Return diagnostic record info
+ */
+static int do_diag (void *o, Tcl_Interp *interp, int argc, char **argv)
+{
+ IrTcl_SetObj *obj = o;
+ int offset;
+ IrTcl_RecordList *rl;
if (argc <= 0)
return TCL_OK;
Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
return TCL_ERROR;
}
- sprintf (buf, "%d", rl->u.diag.condition);
- Tcl_AppendResult (interp, buf, " {",
- (rl->u.diag.addinfo ? rl->u.diag.addinfo : ""),
- "}", NULL);
- return TCL_OK;
+ return ir_diagResult (interp, rl->u.surrogateDiagnostics.list,
+ rl->u.surrogateDiagnostics.num);
}
/*
}
if (rl->which != Z_NamePlusRecord_databaseRecord)
{
- Tcl_AppendResult (interp, "No MARC record at #", argv[2], NULL);
+ Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
return TCL_ERROR;
}
return ir_tcl_get_marc (interp, rl->u.dbrec.buf, argc, argv);
}
+/*
+ * do_getSutrs: Get SUTRS Record
+ */
+static int do_getSutrs (void *o, Tcl_Interp *interp, int argc, char **argv)
+{
+ IrTcl_SetObj *obj = o;
+ int offset;
+ IrTcl_RecordList *rl;
+
+ if (argc <= 0)
+ return TCL_OK;
+ if (argc < 3)
+ {
+ sprintf (interp->result, "wrong # args");
+ return TCL_ERROR;
+ }
+ if (Tcl_GetInt (interp, argv[2], &offset)==TCL_ERROR)
+ return TCL_ERROR;
+ rl = find_IR_record (obj, offset);
+ if (!rl)
+ {
+ Tcl_AppendResult (interp, "No record at #", argv[2], NULL);
+ return TCL_ERROR;
+ }
+ if (rl->which != Z_NamePlusRecord_databaseRecord)
+ {
+ Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
+ return TCL_ERROR;
+ }
+ if (rl->u.dbrec.type != VAL_SUTRS)
+ return TCL_OK;
+ Tcl_AppendElement (interp, rl->u.dbrec.buf);
+ return TCL_OK;
+}
+
/*
* do_responseStatus: Return response status (present or search)
if (argc == 0)
{
obj->recordFlag = 0;
- obj->addinfo = NULL;
+ obj->nonSurrogateDiagnosticNum = 0;
+ obj->nonSurrogateDiagnosticList = NULL;
return TCL_OK;
}
else if (argc == -1)
- return ir_strdel (interp, &obj->addinfo);
+ {
+ ir_deleteDiags (&obj->nonSurrogateDiagnosticList,
+ &obj->nonSurrogateDiagnosticNum);
+ return TCL_OK;
+ }
if (!obj->recordFlag)
{
Tcl_AppendElement (interp, "OK");
Tcl_AppendElement (interp, "DBOSD");
break;
case Z_Records_NSD:
- return mk_nonSurrogateDiagnostics (interp, obj->condition,
- obj->addinfo);
+ Tcl_AppendElement (interp, "NSD");
+ return ir_diagResult (interp, obj->nonSurrogateDiagnosticList,
+ obj->nonSurrogateDiagnosticNum);
}
return TCL_OK;
}
int argc, char **argv)
{
IrTcl_SetObj *obj = o;
- IrTcl_Obj *p = obj->parent;
- Z_APDU apdu, *apdup = &apdu;
- Z_PresentRequest req;
+ IrTcl_Obj *p;
+ Z_APDU *apdu;
+ Z_PresentRequest *req;
int start;
int number;
- int r;
if (argc <= 0)
return TCL_OK;
interp->result = "not connected";
return TCL_ERROR;
}
- odr_reset (p->odr_out);
+ p = obj->parent;
+ p->set_child = obj;
+
obj->start = start;
obj->number = number;
- apdu.which = Z_APDU_presentRequest;
- apdu.u.presentRequest = &req;
+ apdu = zget_APDU (p->odr_out, Z_APDU_presentRequest);
+ req = apdu->u.presentRequest;
- set_referenceId (p->odr_out, &req.referenceId, obj->set_inher.referenceId);
+ set_referenceId (p->odr_out, &req->referenceId,
+ obj->set_inher.referenceId);
- req.resultSetId = obj->setName ? obj->setName : "Default";
+ req->resultSetId = obj->setName ? obj->setName : "Default";
- req.resultSetStartPoint = &start;
- req.numberOfRecordsRequested = &number;
- req.elementSetNames = 0;
- req.preferredRecordSyntax = 0;
-
- if (!z_APDU (p->odr_out, &apdup, 0))
- {
- interp->result = odr_errlist [odr_geterror (p->odr_out)];
- odr_reset (p->odr_out);
- return TCL_ERROR;
- }
- p->sbuf = odr_getbuf (p->odr_out, &p->slen, NULL);
- if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
+ req->resultSetStartPoint = &start;
+ req->numberOfRecordsRequested = &number;
+ if (obj->set_inher.preferredRecordSyntax)
{
- interp->result = "cs_put failed in present";
- return TCL_ERROR;
- }
- else if (r == 1)
- {
- ir_select_add_write (cs_fileno(p->cs_link), p);
- logf (LOG_DEBUG, "Part of present request, start=%d, num=%d"
- " (%d bytes)", start, number, p->slen);
+ struct oident ident;
+
+ ident.proto = p->protocol_type;
+ ident.class = CLASS_RECSYN;
+ ident.value = *obj->set_inher.preferredRecordSyntax;
+ logf (LOG_DEBUG, "Preferred record syntax is %d", ident.value);
+ req->preferredRecordSyntax = odr_oiddup (p->odr_out,
+ oid_getoidbyent (&ident));
}
else
- {
- logf (LOG_DEBUG, "Whole present request, start=%d, num=%d"
- " (%d bytes)", start, number, p->slen);
- }
- return TCL_OK;
+ req->preferredRecordSyntax = 0;
+
+ return ir_tcl_send_APDU (interp, p, apdu, "present");
}
/*
IrTcl_RecordList *rl;
rl = new_IR_record (setobj, no, Z_NamePlusRecord_databaseRecord);
+ rl->u.dbrec.type = VAL_USMARC;
rl->u.dbrec.buf = buf;
rl->u.dbrec.size = size;
no++;
{ 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, "getSutrs", do_getSutrs },
+ { 0, "recordType", do_recordType },
+ { 0, "diag", do_diag },
{ 0, "responseStatus", do_responseStatus },
{ 0, "loadFile", do_loadFile },
{ 0, NULL, NULL}
if (ir_strdup (interp, &dst->referenceId, src->referenceId)
== TCL_ERROR)
return TCL_ERROR;
-
+
+ if (src->preferredRecordSyntax &&
+ (dst->preferredRecordSyntax
+ = malloc (sizeof(*dst->preferredRecordSyntax))))
+ *dst->preferredRecordSyntax = *src->preferredRecordSyntax;
+ else
+ dst->preferredRecordSyntax = NULL;
dst->replaceIndicator = src->replaceIndicator;
dst->smallSetUpperBound = src->smallSetUpperBound;
dst->largeSetLowerBound = src->largeSetLowerBound;
*/
static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- Z_ScanRequest req;
- Z_APDU apdu, *apdup = &apdu;
+ Z_ScanRequest *req;
+ Z_APDU *apdu;
IrTcl_ScanObj *obj = o;
IrTcl_Obj *p = obj->parent;
- int r;
oident bib1;
#if CCL2RPN
struct ccl_rpn_node *rpn;
interp->result = "not connected";
return TCL_ERROR;
}
- odr_reset (p->odr_out);
- bib1.proto = PROTO_Z3950;
+ bib1.proto = p->protocol_type;
bib1.class = CLASS_ATTSET;
bib1.value = VAL_BIB1;
- apdu.which = Z_APDU_scanRequest;
- apdu.u.scanRequest = &req;
- 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 (&bib1);
+ apdu = zget_APDU (p->odr_out, Z_APDU_scanRequest);
+ req = apdu->u.scanRequest;
+
+ 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 (&bib1);
#if !CCL2RPN
- if (!(req.termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
+ if (!(req->termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
{
Tcl_AppendResult (interp, "Syntax error in query", NULL);
return TCL_ERROR;
}
ccl_pr_tree (rpn, stderr);
fprintf (stderr, "\n");
- if (!(req.termListAndStartPoint = ccl_scan_query (rpn)))
+ if (!(req->termListAndStartPoint = ccl_scan_query (rpn)))
return TCL_ERROR;
#endif
- req.stepSize = &obj->stepSize;
- req.numberOfTermsRequested = &obj->numberOfTermsRequested;
- req.preferredPositionInResponse = &obj->preferredPositionInResponse;
- logf (LOG_DEBUG, "stepSize=%d", *req.stepSize);
+ req->stepSize = &obj->stepSize;
+ req->numberOfTermsRequested = &obj->numberOfTermsRequested;
+ req->preferredPositionInResponse = &obj->preferredPositionInResponse;
+ logf (LOG_DEBUG, "stepSize=%d", *req->stepSize);
logf (LOG_DEBUG, "numberOfTermsRequested=%d",
- *req.numberOfTermsRequested);
+ *req->numberOfTermsRequested);
logf (LOG_DEBUG, "preferredPositionInResponse=%d",
- *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, NULL);
- 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);
- logf (LOG_DEBUG, "Sent part of scanRequest (%d bytes)", p->slen);
- }
- else
- {
- logf (LOG_DEBUG, "Whole scan request (%d bytes)", p->slen);
- }
- return TCL_OK;
+ *req->preferredPositionInResponse);
+
+ return ir_tcl_send_APDU (interp, p, apdu, "scan");
}
/*
{
p->entries_flag = 0;
p->entries = NULL;
- p->nonSurrogateDiagnostics = NULL;
+ p->nonSurrogateDiagnosticNum = 0;
+ p->nonSurrogateDiagnosticList = 0;
return TCL_OK;
}
else if (argc == -1)
{
p->entries_flag = 0;
/* release entries */
- p->entries = NULL;
- /* release non diagnostics */
- p->nonSurrogateDiagnostics = NULL;
+ p->entries = NULL;
+
+ ir_deleteDiags (&p->nonSurrogateDiagnosticList,
+ &p->nonSurrogateDiagnosticNum);
return TCL_OK;
}
if (argc != 3)
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);
+ Tcl_AppendElement (interp, "SD");
+ return ir_diagResult (interp, p->entries[i].u.diag.list,
+ p->entries[i].u.diag.num);
break;
}
return TCL_OK;
}
}
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num)
+{
+ int i;
+ for (i = 0; i<*dst_num; i++)
+ free (dst_list[i]->addinfo);
+ free (*dst_list);
+ *dst_list = NULL;
+ *dst_num = 0;
+}
+
+static void ir_handleDiags (IrTcl_Diagnostic **dst_list, int *dst_num,
+ Z_DiagRec **list, int num)
+{
+ int i;
+ char *addinfo;
+
+ *dst_num = num;
+ *dst_list = malloc (sizeof(**dst_list) * num);
+ if (!*dst_list)
+ {
+ *dst_num = 0;
+ return;
+ }
+ for (i = 0; i<num; i++)
+ {
+ switch (list[i]->which)
+ {
+ case Z_DiagRec_defaultFormat:
+ (*dst_list)[i].condition = *list[i]->u.defaultFormat->condition;
+ addinfo = list[i]->u.defaultFormat->addinfo;
+ if (addinfo &&
+ ((*dst_list)[i].addinfo = malloc (strlen(addinfo)+1)))
+ strcpy ((*dst_list)[i].addinfo, addinfo);
+ break;
+ default:
+ (*dst_list)[i].addinfo = NULL;
+ (*dst_list)[i].condition = 0;
+ }
+ }
+}
+
static void ir_handleRecords (void *o, Z_Records *zrs)
{
IrTcl_Obj *p = o;
IrTcl_SetObj *setobj = p->set_child;
+ int offset;
+ IrTcl_RecordList *rl;
+
setobj->which = zrs->which;
setobj->recordFlag = 1;
- if (zrs->which == Z_Records_NSD)
- {
- const char *addinfo;
-
- setobj->numberOfRecordsReturned = 0;
- setobj->condition = *zrs->u.nonSurrogateDiagnostic->condition;
- free (setobj->addinfo);
- setobj->addinfo = NULL;
- addinfo = zrs->u.nonSurrogateDiagnostic->addinfo;
- if (addinfo && (setobj->addinfo = malloc (strlen(addinfo) + 1)))
- strcpy (setobj->addinfo, addinfo);
- logf (LOG_DEBUG, "Diagnostic response. %s (%d): %s",
- diagbib1_str (setobj->condition),
- setobj->condition,
- setobj->addinfo ? setobj->addinfo : "");
- }
- else
+
+ ir_deleteDiags (&setobj->nonSurrogateDiagnosticList,
+ &setobj->nonSurrogateDiagnosticNum);
+ if (zrs->which == Z_Records_DBOSD)
{
- int offset;
- IrTcl_RecordList *rl;
-
setobj->numberOfRecordsReturned =
zrs->u.databaseOrSurDiagnostics->num_records;
logf (LOG_DEBUG, "Got %d records", setobj->numberOfRecordsReturned);
records[offset]->which);
if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
{
- Z_DiagRec *diagrec;
-
- diagrec = zrs->u.databaseOrSurDiagnostics->
- records[offset]->u.surrogateDiagnostic;
-
- rl->u.diag.condition = *diagrec->condition;
- if (diagrec->addinfo && (rl->u.diag.addinfo =
- malloc (strlen (diagrec->addinfo)+1)))
- strcpy (rl->u.diag.addinfo, diagrec->addinfo);
- }
+ ir_handleDiags (&rl->u.surrogateDiagnostics.list,
+ &rl->u.surrogateDiagnostics.num,
+ &zrs->u.databaseOrSurDiagnostics->
+ records[offset]->u.surrogateDiagnostic,
+ 1);
+ }
else
{
Z_DatabaseRecord *zr;
Odr_external *oe;
+ struct oident *ident;
zr = zrs->u.databaseOrSurDiagnostics->records[offset]
->u.databaseRecord;
oe = (Odr_external*) zr;
rl->u.dbrec.size = zr->u.octet_aligned->len;
+
+ rl->u.dbrec.type = VAL_USMARC;
+ if ((ident = oid_getentbyoid (oe->direct_reference)))
+ rl->u.dbrec.type = ident->value;
if (oe->which == ODR_EXTERNAL_octet && rl->u.dbrec.size > 0)
{
- const char *buf = (char*) zr->u.octet_aligned->buf;
+ char *buf = (char*) zr->u.octet_aligned->buf;
if ((rl->u.dbrec.buf = malloc (rl->u.dbrec.size)))
memcpy (rl->u.dbrec.buf, buf, rl->u.dbrec.size);
}
+ else if (rl->u.dbrec.type == VAL_SUTRS &&
+ oe->which == ODR_EXTERNAL_single)
+ {
+ Odr_oct *rc;
+
+ logf (LOG_DEBUG, "Decoding SUTRS");
+ odr_setbuf (p->odr_in, (char*) oe->u.single_ASN1_type->buf,
+ oe->u.single_ASN1_type->len, 0);
+ if (!z_SUTRS(p->odr_in, &rc, 0))
+ {
+ logf (LOG_WARN, "Cannot decode SUTRS");
+ rl->u.dbrec.buf = NULL;
+ }
+ else
+ {
+ if ((rl->u.dbrec.buf = malloc (rc->len+1)))
+ {
+ memcpy (rl->u.dbrec.buf, rc->buf, rc->len);
+ rl->u.dbrec.buf[rc->len] = '\0';
+ }
+ rl->u.dbrec.size = rc->len;
+ }
+ }
else
rl->u.dbrec.buf = NULL;
}
}
}
+ else if (zrs->which == Z_Records_multipleNSD)
+ {
+ logf (LOG_DEBUG, "multipleNonSurrogateDiagnostic %d",
+ zrs->u.multipleNonSurDiagnostics->num_diagRecs);
+ setobj->numberOfRecordsReturned = 0;
+ ir_handleDiags (&setobj->nonSurrogateDiagnosticList,
+ &setobj->nonSurrogateDiagnosticNum,
+ zrs->u.multipleNonSurDiagnostics->diagRecs,
+ zrs->u.multipleNonSurDiagnostics->num_diagRecs);
+ }
+ else
+ {
+ logf (LOG_DEBUG, "NonSurrogateDiagnostic");
+ setobj->numberOfRecordsReturned = 0;
+ ir_handleDiags (&setobj->nonSurrogateDiagnosticList,
+ &setobj->nonSurrogateDiagnosticNum,
+ &zrs->u.nonSurrogateDiagnostic,
+ 1);
+ }
}
static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
free (scanobj->entries);
scanobj->entries = NULL;
- free (scanobj->nonSurrogateDiagnostics);
- scanobj->nonSurrogateDiagnostics = NULL;
+ ir_deleteDiags (&scanobj->nonSurrogateDiagnosticList,
+ &scanobj->nonSurrogateDiagnosticNum);
if (scanrs->entries)
{
int i;
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;
+ ir_handleDiags (&scanobj->entries[i].u.diag.list,
+ &scanobj->entries[i].u.diag.num,
+ &ze->u.surrogateDiagnostic,
+ 1);
break;
}
}
break;
case Z_ListEntries_nonSurrogateDiagnostics:
- scanobj->num_diagRecs = scanrs->entries->
- u.nonSurrogateDiagnostics->num_diagRecs;
- scanobj->nonSurrogateDiagnostics = malloc (scanobj->num_diagRecs *
- sizeof(*scanobj->nonSurrogateDiagnostics));
+ ir_handleDiags (&scanobj->nonSurrogateDiagnosticList,
+ &scanobj->nonSurrogateDiagnosticNum,
+ scanrs->entries->u.nonSurrogateDiagnostics->
+ diagRecs,
+ scanrs->entries->u.nonSurrogateDiagnostics->
+ num_diagRecs);
break;
}
}
Z_APDU *apdu;
int r;
- if (p->connectFlag)
+ if (p->state == IR_TCL_R_Connecting)
{
r = cs_rcvconnect (p->cs_link);
if (r == 1)
+ {
+ logf (LOG_WARN, "cs_rcvconnect returned 1");
return;
- p->connectFlag = 0;
+ }
+ p->state = IR_TCL_R_Idle;
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (r < 0)
{
logf (LOG_DEBUG, "cs_rcvconnect error");
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ {
+ p->failInfo = IR_TCL_FAIL_CONNECT;
+ IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
return;
}
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
+ if (p->cs_link && p->request_queue)
+ ir_tcl_send_q (p, p->request_queue, "x");
return;
}
do
{
/* signal one more use of ir object - callbacks must not
release the ir memory (p pointer) */
+ p->state = IR_TCL_R_Reading;
++(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);
+ {
+ p->failInfo = IR_TCL_FAIL_READ;
+ IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
- /* relase ir object now if callback deleted it */
+ /* release ir object now if callback deleted it */
ir_obj_delete (p);
return;
}
{
logf (LOG_DEBUG, "%s", odr_errlist [odr_geterror (p->odr_in)]);
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ {
+ p->failInfo = IR_TCL_FAIL_IN_APDU;
+ IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
- /* release ir object now if callback deleted it */
+ /* release ir object now if failback deleted it */
ir_obj_delete (p);
return;
}
default:
logf (LOG_WARN, "Received unknown APDU type (%d)", apdu->which);
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ {
+ p->failInfo = IR_TCL_FAIL_UNKNOWN_APDU;
+ IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
}
odr_reset (p->odr_in);
+ if (p->request_queue) /* remove queue entry */
+ {
+ IrTcl_Request *rq;
+ rq = p->request_queue;
+ p->request_queue = rq->next;
+ free (rq->buf_out);
+ free (rq);
+ if (!p->request_queue)
+ p->state = IR_TCL_R_Idle;
+ }
+ else
+ {
+ logf (LOG_FATAL, "Internal error. No queue entry");
+ exit (1);
+ }
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_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));
+ } while (p->cs_link && cs_more (p->cs_link));
+ if (p->cs_link && p->request_queue)
+ ir_tcl_send_q (p, p->request_queue, "x");
}
/*
{
IrTcl_Obj *p = clientData;
int r;
+ IrTcl_Request *rq;
logf (LOG_DEBUG, "In write handler");
- if (p->connectFlag)
+ if (p->state == IR_TCL_R_Connecting)
{
r = cs_rcvconnect (p->cs_link);
if (r == 1)
return;
- p->connectFlag = 0;
+ p->state = IR_TCL_R_Idle;
if (r < 0)
{
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);
+ {
+ p->failInfo = IR_TCL_FAIL_CONNECT;
+ IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
return;
}
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
return;
}
+#if 0
if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
{
logf (LOG_DEBUG, "select write fail");
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ {
+ p->failInfo = IR_TCL_FAIL_WRITE;
+ IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
}
+#else
+ rq = p->request_queue;
+ assert (rq);
+ if ((r=cs_put (p->cs_link, rq->buf_out, rq->len_out)) < 0)
+ {
+ logf (LOG_DEBUG, "select write fail");
+ if (p->failback)
+ {
+ p->failInfo = IR_TCL_FAIL_WRITE;
+ IrTcl_eval (p->interp, p->failback);
+ }
+ free (rq->buf_out);
+ rq->buf_out = NULL;
+ do_disconnect (p, NULL, 2, NULL);
+ }
+#endif
else if (r == 0) /* remove select bit */
{
+ p->state = IR_TCL_R_Waiting;
ir_select_remove_write (cs_fileno (p->cs_link), p);
+ free (rq->buf_out);
+ rq->buf_out = NULL;
}
}
(ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateCommand (interp, "ir-scan", ir_scan_obj_mk,
(ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ irTcl_interp = interp;
return TCL_OK;
}
projects / ir-tcl-moved-to-github.git / blobdiff