* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.41 1995-06-16 12:28:16 adam
+ * 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.
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);
}
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;
}
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},
}
/*
+ * 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);
if (argc == 0)
return ir_strdup (interp, &p->implementationName,
- "Index Data/TCL/TK on YAZ");
+ "Index Data/IrTcl on YAZ");
else if (argc == -1)
return ir_strdel (interp, &p->implementationName);
if (argc == 3)
IrTcl_Obj *p = obj;
if (argc == 0)
- return ir_strdup (interp, &p->implementationVersion, YAZ_VERSION);
+ 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);
int argc, char **argv)
{
IrTcl_Obj *p = obj;
-
+
if (argc == 0)
{
p->targetImplementationName = NULL;
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;
}
ODR_MASK_SET (&p->options, 1);
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;
}
else if (argc == 3)
{
- if (!strcmp (argv[2], "Z3950"))
+ if (!strcmp (argv[2], "Z39"))
p->protocol_type = PROTO_Z3950;
else if (!strcmp (argv[2], "SR"))
p->protocol_type = PROTO_SR;
switch (p->protocol_type)
{
case PROTO_Z3950:
- Tcl_AppendElement (interp, "Z3950");
+ Tcl_AppendElement (interp, "Z39");
break;
case PROTO_SR:
Tcl_AppendElement (interp, "SR");
}
/*
+ * 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;
+ int r;
+
+ 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;
+
+ 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);
+ if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
+ {
+ interp->result = "cs_put failed in triggerResourceControl";
+ 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 triggerResourceControl (%d bytes)",
+ p->slen);
+ }
+ else
+ logf (LOG_DEBUG, "Sent whole of triggerResourceControl (%d bytes)",
+ p->slen);
+ return TCL_OK;
+}
+
+/*
* do_databaseNames: specify database names
*/
static int do_databaseNames (void *obj, Tcl_Interp *interp,
{ 1, "comstack", do_comstack },
{ 1, "protocol", do_protocol },
{ 0, "failback", do_failback },
+{ 0, "failInfo", do_failInfo },
{ 1, "connect", do_connect },
{ 0, "protocolVersion", do_protocolVersion },
{ 0, "initResult", do_initResult },
{ 0, "disconnect", do_disconnect },
{ 0, "callback", do_callback },
+{ 0, "triggerResourceControl", do_triggerResourceControl },
{ 0, NULL, NULL}
};
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)
{
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));
}
IrTcl_SetObj *obj = o;
if (argc <= 0)
+ {
+ obj->nextResultSetPosition = 0;
return TCL_OK;
+ }
return get_set_int (&obj->nextResultSetPosition, interp, argc, argv);
}
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)
int argc, char **argv)
{
IrTcl_SetObj *obj = o;
- IrTcl_Obj *p = obj->parent;
+ IrTcl_Obj *p;
Z_APDU *apdu;
Z_PresentRequest *req;
int start;
interp->result = "not connected";
return TCL_ERROR;
}
+ p = obj->parent;
+ p->set_child = obj;
+
odr_reset (p->odr_out);
obj->start = start;
obj->number = number;
req->resultSetStartPoint = &start;
req->numberOfRecordsRequested = &number;
- req->preferredRecordSyntax = 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;
if (!z_APDU (p->odr_out, &apdu, 0))
{
{ 0, "present", do_present },
{ 0, "type", do_type },
{ 0, "getMarc", do_getMarc },
+ { 0, "getSutrs", do_getSutrs },
{ 0, "recordType", do_recordType },
{ 0, "diag", do_diag },
{ 0, "responseStatus", do_responseStatus },
{
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;
+ 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);
- if (oe->direct_reference)
+ }
+ 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))
{
- struct oident *ident =
- oid_getentbyoid (oe->direct_reference);
- rl->u.dbrec.type = ident->value;
+ 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
{
r = cs_rcvconnect (p->cs_link);
if (r == 1)
+ {
+ logf (LOG_WARN, "cs_rcvconnect returned 1");
return;
+ }
p->connectFlag = 0;
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (r < 0)
{
logf (LOG_DEBUG, "cs_rcvconnect error");
if (p->failback)
+ {
+ p->failInfo = IR_TCL_FAIL_CONNECT;
IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
return;
}
logf (LOG_DEBUG, "cs_get failed, code %d", r);
ir_select_remove (cs_fileno (p->cs_link), p);
if (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 */
{
logf (LOG_DEBUG, "%s", odr_errlist [odr_geterror (p->odr_in)]);
if (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 failback deleted it */
default:
logf (LOG_WARN, "Received unknown APDU type (%d)", apdu->which);
if (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);
logf (LOG_DEBUG, "cs_rcvconnect error");
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (p->failback)
+ {
+ p->failInfo = IR_TCL_FAIL_CONNECT;
IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
return;
}
{
logf (LOG_DEBUG, "select write fail");
if (p->failback)
+ {
+ p->failInfo = IR_TCL_FAIL_WRITE;
IrTcl_eval (p->interp, p->failback);
+ }
do_disconnect (p, NULL, 2, NULL);
}
else if (r == 0) /* remove select bit */
(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