/*
* IR toolkit for tcl/tk
* (c) Index Data 1995
+ * Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.13 1995-03-17 18:26:17 adam
+ * Revision 1.15 1995-03-20 15:24:07 adam
+ * Diagnostic records saved on searchResponse.
+ *
+ * Revision 1.14 1995/03/20 08:53:22 adam
+ * Event loop in tclmain.c rewritten. New method searchStatus.
+ *
+ * Revision 1.13 1995/03/17 18:26:17 adam
* Non-blocking i/o used now. Database names popup as cascade items.
*
* Revision 1.12 1995/03/17 15:45:00 adam
#include "ir-tcl.h"
+#define CS_BLOCK 0
+
typedef struct {
COMSTACK cs_link;
typedef struct IRSetObj_ {
IRObj *parent;
+ int searchStatus;
int resultCount;
int start;
int number;
if (cs_type (p->cs_link) == tcpip_type)
{
cs_close (p->cs_link);
- p->cs_link = cs_create (tcpip_type, 0);
+ p->cs_link = cs_create (tcpip_type, CS_BLOCK);
}
else if (cs_type (p->cs_link) == mosi_type)
{
cs_close (p->cs_link);
- p->cs_link = cs_create (mosi_type, 0);
+ p->cs_link = cs_create (mosi_type, CS_BLOCK);
}
else
{
{
cs_close (((IRObj*) obj)->cs_link);
if (!strcmp (argv[2], "tcpip"))
- ((IRObj *)obj)->cs_link = cs_create (tcpip_type, 0);
+ ((IRObj *)obj)->cs_link = cs_create (tcpip_type, CS_BLOCK);
else if (!strcmp (argv[2], "mosi"))
- ((IRObj *)obj)->cs_link = cs_create (mosi_type, 0);
+ ((IRObj *)obj)->cs_link = cs_create (mosi_type, CS_BLOCK);
else
{
interp->result = "wrong comstack type";
if (argc < 3)
{
- interp->result = "wrong # args";
- return TCL_ERROR;
+ for (i=0; i<p->num_databaseNames; i++)
+ Tcl_AppendElement (interp, p->databaseNames[i]);
+ return TCL_OK;
}
if (p->databaseNames)
{
{ 0, "init", do_init_request },
{ 0, "disconnect", do_disconnect },
{ 0, "callback", do_callback },
- { 0, "databaseNames", do_databaseNames},
+ { 1, "databaseNames", do_databaseNames},
{ 1, "query", do_query },
{ 0, NULL, NULL}
};
}
if (!(obj = ir_malloc (interp, sizeof(*obj))))
return TCL_ERROR;
- obj->cs_link = cs_create (tcpip_type, 0);
+ obj->cs_link = cs_create (tcpip_type, CS_BLOCK);
obj->maximumRecordSize = 32768;
obj->preferredMessageSize = 4096;
req.resultSetName = "Default";
req.num_databaseNames = p->num_databaseNames;
req.databaseNames = p->databaseNames;
+ printf ("Search:");
+ for (r=0; r<p->num_databaseNames; r++)
+ {
+ printf (" %s", p->databaseNames[r]);
+ }
req.smallSetElementSetNames = 0;
req.mediumSetElementSetNames = 0;
req.preferredRecordSyntax = 0;
assert((RPNquery = ccl_rpn_query(rpn)));
RPNquery->attributeSetId = bib1;
query.u.type_1 = RPNquery;
+ printf ("- RPN\n");
}
else if (!strcmp (p->query_method, "ccl"))
{
query.u.type_2 = &ccl_query;
ccl_query.buf = argv[2];
ccl_query.len = strlen (argv[2]);
+ printf ("- CCL\n");
}
else
{
}
/*
+ * do_searchStatus: Get search status (after search response)
+ */
+static int do_searchStatus (void *o, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IRSetObj *obj = o;
+
+ sprintf (interp->result, "%d", obj->searchStatus);
+ return TCL_OK;
+}
+
+/*
* do_numberOfRecordsReturned: Get number of records returned
*/
static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
{
static IRMethod tab[] = {
{ 0, "search", do_search },
+ { 0, "searchStatus", do_searchStatus },
{ 0, "resultCount", do_resultCount },
{ 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },
{ 0, "present", do_present },
/* ------------------------------------------------------- */
-static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
-{
- IRObj *p = o;
- IRSetObj *obj = p->child;
-
- if (obj)
- obj->resultCount = *searchrs->resultCount;
- if (searchrs->searchStatus)
- printf("Search was a success.\n");
- else
- printf("Search was a bloomin' failure.\n");
- printf("Number of hits: %d\n", *searchrs->resultCount);
-}
-
static void ir_initResponse (void *obj, Z_InitResponse *initrs)
{
if (!*initrs->result)
#endif
}
-static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
+static void ir_handleRecords (void *o, Z_Records *zrs)
{
IRObj *p = o;
IRSetObj *setobj = p->child;
- Z_Records *zrs = presrs->records;
- setobj->z_records = presrs->records;
-
- printf ("Received presentResponse\n");
- if (zrs)
- {
- setobj->which = zrs->which;
- if (zrs->which == Z_Records_NSD)
- {
- const char *addinfo;
-
- printf ("They are diagnostic!!!\n");
- 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);
- return;
- }
- else
+ 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);
+ printf ("Diagnostic response. %s (%d), info %s\n",
+ diagbib1_str (setobj->condition),
+ setobj->condition,
+ setobj->addinfo ? setobj->addinfo : "");
+ }
+ else
+ {
+ int offset;
+ IRRecordList *rl;
+
+ setobj->numberOfRecordsReturned =
+ zrs->u.databaseOrSurDiagnostics->num_records;
+ printf ("Got %d records\n", setobj->numberOfRecordsReturned);
+ for (offset = 0; offset<setobj->numberOfRecordsReturned; offset++)
{
- int offset;
- IRRecordList *rl;
-
- setobj->numberOfRecordsReturned =
- zrs->u.databaseOrSurDiagnostics->num_records;
- printf ("Got %d records\n", setobj->numberOfRecordsReturned);
- for (offset = 0; offset<setobj->numberOfRecordsReturned; offset++)
+ rl = new_IR_record (setobj, setobj->start + offset,
+ zrs->u.databaseOrSurDiagnostics->
+ 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);
+ }
+ else
{
- rl = new_IR_record (setobj, setobj->start + offset,
- zrs->u.databaseOrSurDiagnostics->
- records[offset]->which);
- if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
+ Z_DatabaseRecord *zr;
+ Odr_external *oe;
+
+ zr = zrs->u.databaseOrSurDiagnostics->records[offset]
+ ->u.databaseRecord;
+ oe = (Odr_external*) zr;
+ if (oe->which == ODR_EXTERNAL_octet
+ && zr->u.octet_aligned->len)
{
- 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);
+ const char *buf = (char*) zr->u.octet_aligned->buf;
+ rl->u.marc.rec = iso2709_cvt (buf);
}
else
- {
- Z_DatabaseRecord *zr;
- Odr_external *oe;
-
- zr = zrs->u.databaseOrSurDiagnostics->records[offset]
- ->u.databaseRecord;
- oe = (Odr_external*) zr;
- if (oe->which == ODR_EXTERNAL_octet
- && zr->u.octet_aligned->len)
- {
- const char *buf = (char*) zr->u.octet_aligned->buf;
- rl->u.marc.rec = iso2709_cvt (buf);
- }
- else
- rl->u.marc.rec = NULL;
- }
+ rl->u.marc.rec = NULL;
}
}
}
+}
+
+static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
+{
+ IRObj *p = o;
+ IRSetObj *obj = p->child;
+
+ if (obj)
+ {
+ obj->searchStatus = searchrs->searchStatus ? 1 : 0;
+ obj->resultCount = *searchrs->resultCount;
+ printf ("Search response %d, %d hits\n",
+ obj->searchStatus, obj->resultCount);
+ if (searchrs->records)
+ ir_handleRecords (o, searchrs->records);
+ }
+ else
+ printf ("Search response, no object!\n");
+}
+
+
+static void ir_presentResponse (void *o, Z_PresentResponse *presrs)
+{
+ IRObj *p = o;
+ IRSetObj *setobj = p->child;
+ Z_Records *zrs = presrs->records;
+ setobj->z_records = presrs->records;
+
+ printf ("Received presentResponse\n");
+ if (zrs)
+ {
+ setobj->which = zrs->which;
+ ir_handleRecords (o, zrs);
+ }
else
{
printf ("No records!\n");
{
IRObj *p = clientData;
int r;
-
+
+ printf ("In write handler.....\n");
if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
{
printf ("select write fail\n");
projects / ir-tcl-moved-to-github.git / blobdiff