* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.83 1996-03-05 09:21:09 adam
+ * Revision 1.86 1996-03-20 13:54:04 adam
+ * The Tcl_File structure is only manipulated in the Tk-event interface
+ * in tkinit.c.
+ *
+ * Revision 1.85 1996/03/15 11:15:48 adam
+ * Modified to use new prototypes for p_query_rpn and p_query_scan.
+ *
+ * Revision 1.84 1996/03/07 12:42:49 adam
+ * Better logging when callback is invoked.
+ *
+ * Revision 1.83 1996/03/05 09:21:09 adam
* Bug fix: memory used by GRS records wasn't freed.
* Rewrote some of the error handling code - the connection is always
* closed before failback is called.
#define CS_BLOCK 0
-#define IRTCL_GENERIC_FILES 0
-
#include "ir-tclp.h"
static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);
ir_tcl_grs_del (&rl->u.dbrec.u.grs1);
break;
default:
+ break;
}
free (rl->u.dbrec.buf);
break;
char *tmp = ir_tcl_malloc (strlen(command)+1);
int r;
- logf (LOG_DEBUG, "Invoking %.17s ...", command);
+ logf (LOG_DEBUG, "Invoking %.23s ...", command);
strcpy (tmp, command);
r = Tcl_Eval (interp, tmp);
if (r == TCL_ERROR)
}
if (ir_tcl_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
return TCL_ERROR;
-#if IRTCL_GENERIC_FILES
-#ifdef WINDOWS
- p->csFile = Tcl_GetFile (cs_fileno(p->cs_link), TCL_WIN_SOCKET);
-#else
- p->csFile = Tcl_GetFile (cs_fileno(p->cs_link), TCL_UNIX_FD);
-#endif
-#endif
if ((r=cs_connect (p->cs_link, addr)) < 0)
{
interp->result = "connect fail";
ir_tcl_disconnect (p);
return TCL_ERROR;
}
- logf(LOG_DEBUG, "cs_connect() returned %d fd=%d", r,
+ logf(LOG_DEBUG, "cs_connect() returned %d fd=%d", r,
cs_fileno(p->cs_link));
p->eventType = "connect";
-#if IRTCL_GENERIC_FILES
- ir_select_add (p->csFile, p);
-#else
ir_select_add (cs_fileno (p->cs_link), p);
-#endif
if (r == 1)
{
-#if IRTCL_GENERIC_FILES
- ir_select_add_write (p->csFile, p);
-#else
ir_select_add_write (cs_fileno (p->cs_link), p);
-#endif
p->state = IR_TCL_R_Connecting;
}
else
{
if (p->hostname)
{
- logf(LOG_DEBUG, "Closing connection to %s", p->hostname);
+ logf(LOG_DEBUG, "Closing connection to %s", p->hostname);
free (p->hostname);
p->hostname = NULL;
-#if IRTCL_GENERIC_FILES
- ir_select_remove_write (p->csFile, p);
- ir_select_remove (p->csFile, p);
-#else
ir_select_remove_write (cs_fileno (p->cs_link), p);
ir_select_remove (cs_fileno (p->cs_link), p);
-#endif
odr_reset (p->odr_in);
assert (p->cs_link);
cs_close (p->cs_link);
p->cs_link = NULL;
-#if IRTCL_GENERIC_FILES
- Tcl_FreeFile (p->csFile);
- p->csFile = NULL;
-#endif
ODR_MASK_ZERO (&p->options);
ODR_MASK_SET (&p->options, 0);
p->eventType = NULL;
p->hostname = NULL;
p->cs_link = NULL;
-#if IRTCL_GENERIC_FILES
- p->csFile = 0;
-#endif
return TCL_OK;
}
ir_tcl_disconnect (p);
}
else if (argc == 2)
{
- Tcl_AppendElement (interp, IrTcl_getRecordSyntaxStr
- (*p->preferredRecordSyntax));
+ Tcl_AppendElement
+ (interp,!p->preferredRecordSyntax ? "" :
+ IrTcl_getRecordSyntaxStr(*p->preferredRecordSyntax));
}
return TCL_OK;
IrTcl_SetObj *obj = o;
IrTcl_Obj *p;
int r;
- oident bib1;
if (argc <= 0)
return TCL_OK;
obj->start = 1;
- bib1.proto = p->protocol_type;
- bib1.oclass = CLASS_ATTSET;
- bib1.value = VAL_BIB1;
-
set_referenceId (p->odr_out, &req->referenceId,
obj->set_inher.referenceId);
{
Z_RPNQuery *RPNquery;
- RPNquery = p_query_rpn (p->odr_out, argv[2]);
+ RPNquery = p_query_rpn (p->odr_out, p->protocol_type, argv[2]);
if (!RPNquery)
{
Tcl_AppendResult (interp, "Syntax error in query", NULL);
return TCL_ERROR;
}
- RPNquery->attributeSetId = oid_getoidbyent (&bib1);
query.which = Z_Query_type_1;
query.u.type_1 = RPNquery;
logf (LOG_DEBUG, "RPN");
int pos;
struct ccl_rpn_node *rpn;
Z_RPNQuery *RPNquery;
+ oident bib1;
+
+ bib1.proto = p->protocol_type;
+ bib1.oclass = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
rpn = ccl_find_str(p->bibset, argv[2], &error, &pos);
if (error)
Z_APDU *apdu;
IrTcl_ScanObj *obj = o;
IrTcl_Obj *p = obj->parent;
- oident bib1;
#if CCL2RPN
+ oident bib1;
struct ccl_rpn_node *rpn;
int pos;
#endif
return TCL_ERROR;
}
- bib1.proto = p->protocol_type;
- bib1.oclass = CLASS_ATTSET;
- bib1.value = VAL_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, p->protocol_type,
+ &req->attributeSet, argv[2])))
{
Tcl_AppendResult (interp, "Syntax error in query", NULL);
return TCL_ERROR;
Tcl_AppendResult (interp, "CCL error: ", ccl_err_msg (r), NULL);
return TCL_ERROR;
}
+ bib1.proto = p->protocol_type;
+ bib1.oclass = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
+
+ req->attributeSet = oid_getoidbyent (&bib1);
ccl_pr_tree (rpn, stderr);
fprintf (stderr, "\n");
if (!(req->termListAndStartPoint = ccl_scan_query (rpn)))
logf(LOG_DEBUG, "Read handler fd=%d", cs_fileno(p->cs_link));
if (p->state == IR_TCL_R_Connecting)
{
- logf(LOG_DEBUG, "Connect handler");
+ logf(LOG_DEBUG, "read: connect");
r = cs_rcvconnect (p->cs_link);
if (r == 1)
{
}
p->state = IR_TCL_R_Idle;
p->ref_count = 2;
-#if IRTCL_GENERIC_FILES
- ir_select_remove_write (p->csFile, p);
-#else
ir_select_remove_write (cs_fileno (p->cs_link), p);
-#endif
if (r < 0)
{
logf (LOG_DEBUG, "cs_rcvconnect error");
/* read incoming APDU */
if ((r=cs_get (p->cs_link, &p->buf_in, &p->len_in)) == 1)
- {
- logf(LOG_DEBUG, "PDU Fraction read");
+ {
+ logf(LOG_DEBUG, "PDU Fraction read");
return ;
- }
+ }
/* signal one more use of ir object - callbacks must not
release the ir memory (p pointer) */
p->ref_count = 2;
if (r <= 0)
{
logf (LOG_DEBUG, "cs_get failed, code %d", r);
-#if IRTCL_GENERIC_FILES
- ir_select_remove (p->csFile, p);
-#else
ir_select_remove (cs_fileno (p->cs_link), p);
-#endif
ir_tcl_disconnect (p);
if (p->failback)
{
if (!z_APDU (p->odr_in, &apdu, 0))
{
logf (LOG_DEBUG, "cs_get failed: %s",
- odr_errmsg (odr_geterror (p->odr_in)));
+ odr_errmsg (odr_geterror (p->odr_in)));
ir_tcl_disconnect (p);
if (p->failback)
{
ir_obj_delete (p);
return;
}
- logf(LOG_DEBUG, "Decoded ok");
+ logf(LOG_DEBUG, "Decoded ok");
/* handle APDU and invoke callback */
rq = p->request_queue;
if (!rq)
case Z_APDU_initResponse:
p->eventType = "init";
ir_initResponse (p, apdu->u.initResponse);
- apdu_call = p->initResponse;
+ apdu_call = p->initResponse;
break;
case Z_APDU_searchResponse:
p->eventType = "search";
logf (LOG_DEBUG, "Write handler fd=%d", cs_fileno(p->cs_link));
if (p->state == IR_TCL_R_Connecting)
{
- logf(LOG_DEBUG, "Connect handler");
+ logf(LOG_DEBUG, "write: connect");
r = cs_rcvconnect (p->cs_link);
if (r == 1)
{
}
p->state = IR_TCL_R_Idle;
p->ref_count = 2;
-#if IRTCL_GENERIC_FILES
- ir_select_remove_write (p->csFile, p);
-#else
ir_select_remove_write (cs_fileno (p->cs_link), p);
-#endif
if (r < 0)
{
logf (LOG_DEBUG, "cs_rcvconnect error");
}
else if (r == 0) /* remove select bit */
{
- logf (LOG_DEBUG, "Write completed");
+ logf (LOG_DEBUG, "Write completed");
p->state = IR_TCL_R_Waiting;
-#if IRTCL_GENERIC_FILES
- ir_select_remove_write (p->csFile, p);
-#else
ir_select_remove_write (cs_fileno (p->cs_link), p);
-#endif
free (rq->buf_out);
rq->buf_out = NULL;
}
{
if (r)
ir_select_read (clientData);
- if (w)
+ else if (w)
ir_select_write (clientData);
}
projects / ir-tcl-moved-to-github.git / blobdiff