* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.76 1998-05-27 16:57:07 adam
+ * Revision 1.82 1998-10-20 14:00:30 quinn
+ * Fixed Scan
+ *
+ * Revision 1.81 1998/10/13 16:12:24 adam
+ * Added support for Surrogate Diagnostics for Scan Term entries.
+ *
+ * Revision 1.80 1998/09/02 12:41:53 adam
+ * Added decode stream in bend search structures.
+ *
+ * Revision 1.79 1998/08/19 16:10:08 adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.78 1998/08/03 10:23:55 adam
+ * Fixed bug regarding Options for Sort.
+ *
+ * Revision 1.77 1998/07/20 12:38:42 adam
+ * Implemented delete result set service to server API.
+ *
+ * Revision 1.76 1998/05/27 16:57:07 adam
* Support for surrogate diagnostic records added for bend_fetch.
*
* Revision 1.75 1998/05/18 10:13:07 adam
static Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd);
static void process_close(association *assoc, request *reqb);
void save_referenceId (request *reqb, Z_ReferenceId *refid);
+static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
+ int *fd);
static FILE *apduf = 0; /* for use in static mode */
static statserv_options_block *control_block = 0;
xfree(h);
}
-static void do_close(association *a, int reason, char *message)
+static void do_close_req(association *a, int reason, char *message,
+ request *req)
{
Z_APDU apdu;
Z_Close *cls = zget_Close(a->encode);
- request *req = request_get(&a->outgoing);
-
+
/* Purge request queue */
while (request_deq(&a->incoming));
while (request_deq(&a->outgoing));
a->state = ASSOC_DEAD;
}
+static void do_close(association *a, int reason, char *message)
+{
+ do_close_req (a, reason, message, request_get(&a->outgoing));
+}
+
/*
* This is where PDUs from the client are read and the further
* processing is initiated. Flow of control moves down through the
{
request_deq(&assoc->incoming);
if (process_request(assoc, req) < 0)
- do_close(assoc, Z_Close_systemProblem, "Unknown error");
+ do_close_req(assoc, Z_Close_systemProblem, "Unknown error",
+ req);
}
}
if (event & EVENT_OUTPUT)
res = process_presentRequest(assoc, req, &fd); break;
case Z_APDU_scanRequest:
res = process_scanRequest(assoc, req, &fd); break;
-/* Chas: Added in from DALI */
case Z_APDU_extendedServicesRequest:
if (assoc->bend_esrequest)
res = process_ESRequest(assoc, req, &fd);
logf(LOG_WARN, "Cannot handle EXTENDED SERVICES APDU");
return -1;
}
-/* Chas: End of addition from DALI */
break;
case Z_APDU_sortRequest:
if (assoc->bend_sort)
break;
case Z_APDU_close:
process_close(assoc, req); return 0;
+ case Z_APDU_deleteResultSetRequest:
+ if (assoc->bend_delete)
+ res = process_deleteRequest(assoc, req, &fd);
+ else
+ {
+ logf (LOG_WARN, "Cannot handle Delete APDU");
+ return -1;
+ }
+ break;
default:
logf(LOG_WARN, "Bad APDU received");
return -1;
binitreq.bend_search = NULL;
binitreq.bend_present = NULL;
binitreq.bend_esrequest = NULL;
+ binitreq.bend_delete = NULL;
if (!(binitres = bend_init(&binitreq)))
{
logf(LOG_WARN, "Bad response from backend.");
logf (LOG_DEBUG, "Present handler installed");
if ((assoc->bend_esrequest = (int (*)())binitreq.bend_esrequest))
logf (LOG_DEBUG, "ESRequest handler installed");
+ if ((assoc->bend_delete = (int (*)())binitreq.bend_delete))
+ logf (LOG_DEBUG, "Delete handler installed");
resp->referenceId = req->referenceId;
*options = '\0';
ODR_MASK_SET(resp->options, Z_Options_present);
strcat(options, " prst");
}
- if (ODR_MASK_GET(req->options, Z_Options_delSet))
+ if (ODR_MASK_GET(req->options, Z_Options_delSet) && binitreq.bend_delete)
{
ODR_MASK_SET(resp->options, Z_Options_delSet);
strcat(options, " del");
ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
strcat(options, " concurop");
}
- if (ODR_MASK_GET(req->options, Z_Options_sort && binitreq.bend_sort))
+ if (ODR_MASK_GET(req->options, Z_Options_sort) && binitreq.bend_sort)
{
ODR_MASK_SET(resp->options, Z_Options_sort);
strcat(options, " sort");
static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
int oid[OID_SIZE];
- Z_Records *rec = (Z_Records *)odr_malloc (assoc->encode, sizeof(*rec));
+ Z_Records *rec = (Z_Records *)
+ odr_malloc (assoc->encode, sizeof(*rec));
oident bib1;
- int *err = (int *)odr_malloc (assoc->encode, sizeof(*err));
- Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*dr));
+ int *err = (int *)
+ odr_malloc (assoc->encode, sizeof(*err));
+ Z_DiagRec *drec = (Z_DiagRec *)
+ odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*dr));
bib1.proto = assoc->proto;
bib1.oclass = CLASS_DIAGSET;
bsrr->basenames = req->databaseNames;
bsrr->query = req->query;
bsrr->stream = assoc->encode;
+ bsrr->decode = assoc->decode;
bsrr->errcode = 0;
bsrr->hits = 0;
bsrr->errstring = NULL;
bsrq.basenames = req->databaseNames;
bsrq.query = req->query;
bsrq.stream = assoc->encode;
+ bsrq.decode = assoc->decode;
if (!(bsrt = bend_search(assoc->backend, &bsrq, fd)))
return 0;
bsrr->hits = bsrt->hits;
res->numberOfEntriesReturned = numberOfEntriesReturned;
res->positionOfTerm = 0;
res->entries = ents;
-#if ASN_COMPILED
ents->num_entries = 0;
ents->entries = NULL;
ents->num_nonsurrogateDiagnostics = 0;
ents->nonsurrogateDiagnostics = NULL;
-#else
- ents->which = Z_ListEntries_entries;
-#endif
res->attributeSet = 0;
res->otherInfo = 0;
else
{
int i;
-#ifdef ASN_COMPILED
-#else
- Z_Entries *list = (Z_Entries *)
- odr_malloc (assoc->encode, sizeof(*list));
-#endif
Z_Entry **tab = (Z_Entry **)
odr_malloc (assoc->encode, sizeof(*tab) * srs->num_entries);
*scanStatus = Z_Scan_partial_5;
else
*scanStatus = Z_Scan_success;
-#ifdef ASN_COMPILED
ents->entries = tab;
ents->num_entries = srs->num_entries;
res->numberOfEntriesReturned = &ents->num_entries;
-#else
- ents->u.entries = list;
- list->entries = tab;
- list->num_entries = srs->num_entries;
- res->numberOfEntriesReturned = &list->num_entries;
-#endif
res->positionOfTerm = &srs->term_position;
for (i = 0; i < srs->num_entries; i++)
{
Odr_oct *o;
tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e));
- e->which = Z_Entry_termInfo;
- e->u.termInfo = t = (Z_TermInfo *)odr_malloc(assoc->encode, sizeof(*t));
- t->suggestedAttributes = 0;
- t->displayTerm = 0;
- t->alternativeTerm = 0;
- t->byAttributes = 0;
- t->otherTermInfo = 0;
- t->globalOccurrences = &srs->entries[i].occurrences;
- t->term = (Z_Term *)odr_malloc(assoc->encode, sizeof(*t->term));
- t->term->which = Z_Term_general;
- t->term->u.general = o = (Odr_oct *)odr_malloc(assoc->encode,
- sizeof(Odr_oct));
- o->buf = (unsigned char *)odr_malloc(assoc->encode, o->len = o->size =
- strlen(srs->entries[i].term));
- memcpy(o->buf, srs->entries[i].term, o->len);
- logf(LOG_DEBUG, " term #%d: '%s' (%d)", i,
- srs->entries[i].term, srs->entries[i].occurrences);
+ if (srs->entries[i].occurrences >= 0)
+ {
+ e->which = Z_Entry_termInfo;
+ e->u.termInfo = t = (Z_TermInfo *)
+ odr_malloc(assoc->encode, sizeof(*t));
+ t->suggestedAttributes = 0;
+ t->displayTerm = 0;
+ t->alternativeTerm = 0;
+ t->byAttributes = 0;
+ t->otherTermInfo = 0;
+ t->globalOccurrences = &srs->entries[i].occurrences;
+ t->term = (Z_Term *)
+ odr_malloc(assoc->encode, sizeof(*t->term));
+ t->term->which = Z_Term_general;
+ t->term->u.general = o =
+ (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct));
+ o->buf = (unsigned char *)
+ odr_malloc(assoc->encode, o->len = o->size =
+ strlen(srs->entries[i].term));
+ memcpy(o->buf, srs->entries[i].term, o->len);
+ logf(LOG_DEBUG, " term #%d: '%s' (%d)", i,
+ srs->entries[i].term, srs->entries[i].occurrences);
+ }
+ else
+ {
+ Z_Records *zrecords = diagrec (assoc,
+ srs->entries[i].errcode,
+ srs->entries[i].errstring);
+ logf(LOG_DEBUG, " term sd code=%d addinfo=%s",
+ srs->entries[i].errcode,
+ (srs->entries[i].errstring?srs->entries[i].errstring :
+ "<null>"));
+ assert (zrecords->which == Z_Records_NSD);
+ e->which = Z_Entry_surrogateDiagnostic;
+ e->u.surrogateDiagnostic =
+ zrecords->u.nonSurrogateDiagnostic;
+ }
}
}
}
if (diagrecs_p)
{
-#ifdef ASN_COMPILED
ents->num_nonsurrogateDiagnostics = diagrecs_p->num_diagRecs;
ents->nonsurrogateDiagnostics = diagrecs_p->diagRecs;
-#else
- ents->u.nonSurrogateDiagnostics = diagrecs_p;
- ents->which = Z_ListEntries_nonSurrogateDiagnostics;
-#endif
}
return apdu;
}
return apdu;
}
+static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
+ int *fd)
+{
+ Z_DeleteResultSetRequest *req = reqb->request->u.deleteResultSetRequest;
+ Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *)
+ odr_malloc (assoc->encode, sizeof(*res));
+ bend_delete_rr *bdrr = (bend_delete_rr *)
+ odr_malloc (assoc->encode, sizeof(*bdrr));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+
+ logf(LOG_LOG, "Got DeleteRequest.");
+
+ bdrr->num_setnames = req->num_resultSetList;
+ bdrr->setnames = req->resultSetList;
+ bdrr->stream = assoc->encode;
+ bdrr->function = *req->deleteFunction;
+
+ ((int (*)(void *, bend_delete_rr *))
+ (*assoc->bend_delete))(assoc->backend, bdrr);
+
+ res->referenceId = req->referenceId;
+
+ res->deleteOperationStatus = (int *)
+ odr_malloc (assoc->encode, sizeof(*res->deleteOperationStatus));
+ *res->deleteOperationStatus = bdrr->delete_status;
+
+ res->deleteListStatuses = 0;
+ res->numberNotDeleted = 0;
+ res->bulkStatuses = 0;
+ res->deleteMessage = 0;
+ res->otherInfo = 0;
+
+ apdu->which = Z_APDU_deleteResultSetResponse;
+ apdu->u.deleteResultSetResponse = res;
+ return apdu;
+}
+
static void process_close(association *assoc, request *reqb)
{
Z_Close *req = reqb->request->u.close;
req->diagnosticInformation : "NULL");
if (assoc->version < 3) /* to make do_force respond with close */
assoc->version = 3;
- do_close(assoc, Z_Close_finished, "Association terminated by client");
+ do_close_req(assoc, Z_Close_finished, "Association terminated by client",
+ reqb);
}
void save_referenceId (request *reqb, Z_ReferenceId *refid)
projects / yaz-moved-to-github.git / blobdiff