* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.18 1995-03-21 15:50:12 adam
+ * Revision 1.21 1995-03-31 08:56:37 adam
+ * New button "Search".
+ *
+ * Revision 1.20 1995/03/29 16:07:09 adam
+ * Bug fix: Didn't use setName in present request.
+ *
+ * Revision 1.19 1995/03/28 12:45:23 adam
+ * New ir method failback: called on disconnect/protocol error.
+ * New ir set/get method: protocol: SR / Z3950.
+ * Simple popup and disconnect when failback is invoked.
+ *
+ * Revision 1.18 1995/03/21 15:50:12 adam
* Minor changes.
*
* Revision 1.17 1995/03/21 13:41:03 adam
#include <assert.h>
#include <yaz-ccl.h>
-#include <iso2709p.h>
+#include <iso2709.h>
#include <comstack.h>
#include <tcpip.h>
typedef struct {
char *cs_type;
+ char *protocol_type;
int connectFlag;
COMSTACK cs_link;
Tcl_Interp *interp;
char *callback;
+ char *failback;
int smallSetUpperBound;
int largeSetLowerBound;
Z_InitRequest req;
int r;
+ if (!p->cs_link)
+ {
+ interp->result = "not connected";
+ return TCL_ERROR;
+ }
req.referenceId = 0;
req.options = &p->options;
req.protocolVersion = &p->protocolVersion;
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);
return TCL_ERROR;
}
else if (r == 1)
void *addr;
IRObj *p = obj;
int r;
+ int protocol_type = CS_Z3950;
if (argc == 3)
{
interp->result = "already connected";
return TCL_ERROR;
}
+ if (!strcmp (p->protocol_type, "Z3950"))
+ protocol_type = CS_Z3950;
+ else if (!strcmp (p->protocol_type, "SR"))
+ protocol_type = CS_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);
+ p->cs_link = cs_create (tcpip_type, CS_BLOCK, protocol_type);
addr = tcpip_strtoaddr (argv[2]);
if (!addr)
{
#if MOSI
else if (!strcmp (p->cs_type, "mosi"))
{
- p->cs_link = cs_create (mosi_type, CS_BLOCK);
+ p->cs_link = cs_create (mosi_type, CS_BLOCK, protocol_type);
addr = mosi_strtoaddr (argv[2]);
if (!addr)
{
#endif
else
{
- interp->result = "unknown cs type";
+ interp->result = "unknown comstack type";
return TCL_ERROR;
}
if (ir_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
if ((r=cs_connect (p->cs_link, addr)) < 0)
{
interp->result = "cs_connect fail";
+ do_disconnect (p, NULL, 0, NULL);
return TCL_ERROR;
}
ir_select_add (cs_fileno (p->cs_link), p);
Tcl_Eval (p->interp, p->callback);
}
}
- Tcl_AppendElement (interp, p->hostname);
+ if (p->hostname)
+ Tcl_AppendElement (interp, p->hostname);
return TCL_OK;
}
{
free (p->hostname);
p->hostname = NULL;
+ ir_select_remove_write (cs_fileno (p->cs_link), p);
ir_select_remove (cs_fileno (p->cs_link), p);
assert (p->cs_link);
cs_close (p->cs_link);
p->cs_link = NULL;
}
+ assert (!p->cs_link);
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)
+{
+ IRObj *obj = o;
+
+ 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
*/
static int do_callback (void *obj, Tcl_Interp *interp,
}
/*
+ * do_failback: add error handle callback
+ */
+static int do_failback (void *obj, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IRObj *p = obj;
+
+ if (argc == 3)
+ {
+ free (p->failback);
+ if (ir_strdup (interp, &p->failback, argv[2]) == TCL_ERROR)
+ return TCL_ERROR;
+ p->interp = interp;
+ }
+ return TCL_OK;
+}
+
+/*
* do_databaseNames: specify database names
*/
static int do_databaseNames (void *obj, Tcl_Interp *interp,
{
static IRMethod tab[] = {
{ 1, "comstack", do_comstack },
+ { 1, "protocol", do_protocol },
{ 1, "connect", do_connect },
{ 0, "protocolVersion", do_protocolVersion },
{ 0, "options", do_options },
{ 0, "init", do_init_request },
{ 0, "disconnect", do_disconnect },
{ 0, "callback", do_callback },
+ { 0, "failback", do_failback },
{ 1, "databaseNames", do_databaseNames},
{ 1, "replaceIndicator", do_replaceIndicator},
{ 1, "query", do_query },
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->maximumRecordSize = 32768;
obj->buf_in = NULL;
obj->callback = NULL;
+ obj->failback = NULL;
Tcl_CreateCommand (interp, argv[1], ir_obj_method,
(ClientData) obj, ir_obj_delete);
return TCL_OK;
interp->result = "no databaseNames";
return TCL_ERROR;
}
+ if (!p->cs_link)
+ {
+ interp->result = "not connected";
+ return TCL_ERROR;
+ }
apdu.which = Z_APDU_searchRequest;
apdu.u.searchRequest = &req;
apdup = &apdu;
{
query.which = Z_Query_type_2;
query.u.type_2 = &ccl_query;
- ccl_query.buf = argv[2];
+ ccl_query.buf = (unsigned char *) argv[2];
ccl_query.len = strlen (argv[2]);
printf ("- CCL\n");
}
return TCL_OK;
}
-static int marc_cmp (const char *field, const char *pattern)
-{
- if (*pattern == '*')
- return 0;
- for (; *field && *pattern; field++, pattern++)
- {
- if (*pattern == '?')
- continue;
- if (*pattern != *field)
- break;
- }
- return *field - *pattern;
-}
-
static int get_marc_fields(Tcl_Interp *interp, Iso2709Rec rec,
int argc, char **argv)
{
- struct iso2709_dir *dir;
- struct iso2709_field *field;
+ Iso2709Anchor a;
+ char *data;
- for (dir = rec->directory; dir; dir = dir->next)
+ a = iso2709_a_mk (rec);
+ while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
{
- if (argc > 4 && marc_cmp (dir->tag, argv[4]))
- continue;
- if (argc > 5 && marc_cmp (dir->indicator, argv[5]))
- continue;
- for (field = dir->fields; field; field = field->next)
- {
- if (argc > 6 && marc_cmp (field->identifier, argv[6]))
- continue;
- Tcl_AppendElement (interp, field->data);
- }
+ if (!(iso2709_a_info_field (a, NULL, NULL, NULL, &data)))
+ break;
+ Tcl_AppendElement (interp, data);
+ iso2709_a_next (a);
}
+
+ iso2709_a_rm (a);
return TCL_OK;
}
-static int get_marc_lines (Tcl_Interp *interp, Iso2709Rec rec,
- int argc, char **argv)
+static int get_marc_lines(Tcl_Interp *interp, Iso2709Rec rec,
+ int argc, char **argv)
{
- struct iso2709_dir *dir;
- struct iso2709_field *field;
+ Iso2709Anchor a;
+ char *tag;
+ char *indicator;
+ char *identifier;
+ char *data;
+ char *ptag = "";
- for (dir = rec->directory; dir; dir = dir->next)
+ a = iso2709_a_mk (rec);
+ while (iso2709_a_search (a, argv[4], argv[5], argv[6]))
{
- if (argc > 4 && marc_cmp (dir->tag, argv[4]))
- continue;
- if (!dir->indicator)
- Tcl_AppendResult (interp, "{", dir->tag, " {} {", NULL);
- else
- {
- if (argc > 5 && marc_cmp (dir->indicator, argv[5]))
- continue;
- Tcl_AppendResult (interp, "{", dir->tag, " {", dir->indicator,
- "} {", NULL);
- }
- for (field = dir->fields; field; field = field->next)
+ if (!(iso2709_a_info_field (a, &tag, &indicator, &identifier, &data)))
+ break;
+ if (strcmp (tag, ptag))
{
- if (!field->identifier)
- Tcl_AppendResult (interp, "{{}", NULL);
+ if (*ptag)
+ Tcl_AppendResult (interp, "}} ", NULL);
+ if (!indicator)
+ Tcl_AppendResult (interp, "{", tag, " {} {", NULL);
else
- {
- if (argc > 6 && marc_cmp (field->identifier, argv[6]))
- continue;
- Tcl_AppendResult (interp, "{", field->identifier, NULL);
- }
- Tcl_AppendElement (interp, field->data);
- Tcl_AppendResult (interp, "} ", NULL);
+ Tcl_AppendResult (interp, "{", tag, " {", indicator,
+ "} {", NULL);
+ ptag = tag;
}
- Tcl_AppendResult (interp, "}} ", NULL);
+ if (!identifier)
+ Tcl_AppendResult (interp, "{{}", NULL);
+ else
+ Tcl_AppendResult (interp, "{", identifier, NULL);
+ Tcl_AppendElement (interp, data);
+ Tcl_AppendResult (interp, "} ", NULL);
+ iso2709_a_next (a);
}
+ if (*ptag)
+ Tcl_AppendResult (interp, "}} ", NULL);
+ iso2709_a_rm (a);
return TCL_OK;
}
}
else
number = 10;
+ if (!p->cs_link)
+ {
+ interp->result = "not connected";
+ return TCL_ERROR;
+ }
obj->start = start;
obj->number = number;
apdu.u.presentRequest = &req;
req.referenceId = 0;
/* sprintf(setstring, "%d", setnumber); */
- req.resultSetId = "Default";
+
+ req.resultSetId = obj->setName ? obj->setName : "Default";
+
req.resultSetStartPoint = &start;
req.numberOfRecordsRequested = &number;
req.elementSetNames = 0;
if (r < 0)
{
printf ("cs_rcvconnect error\n");
+ if (p->failback)
+ Tcl_Eval (p->interp, p->failback);
+ do_disconnect (p, NULL, 0, NULL);
return;
}
if (p->callback)
{
printf ("cs_get failed\n");
ir_select_remove (cs_fileno (p->cs_link), p);
+ if (p->failback)
+ Tcl_Eval (p->interp, p->failback);
+ do_disconnect (p, NULL, 0, NULL);
return;
}
if (r == 1)
if (!z_APDU (p->odr_in, &apdu, 0))
{
printf ("%s\n", odr_errlist [odr_geterror (p->odr_in)]);
+ if (p->failback)
+ Tcl_Eval (p->interp, p->failback);
+ do_disconnect (p, NULL, 0, NULL);
return;
}
switch(apdu->which)
default:
printf("Received unknown APDU type (%d).\n",
apdu->which);
+ if (p->failback)
+ Tcl_Eval (p->interp, p->failback);
+ do_disconnect (p, NULL, 0, NULL);
}
if (p->callback)
Tcl_Eval (p->interp, p->callback);
{
printf ("cs_rcvconnect error\n");
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);
return;
}
ir_select_remove_write (cs_fileno (p->cs_link), p);
if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
{
printf ("select write fail\n");
- cs_close (p->cs_link);
+ if (p->failback)
+ Tcl_Eval (p->interp, p->failback);
+ do_disconnect (p, NULL, 0, NULL);
}
else if (r == 0) /* remove select bit */
{