* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.10 1995-03-27 08:34:24 quinn
+ * Revision 1.15 1995-03-30 14:03:23 quinn
+ * Added RFC1006 as separate library
+ *
+ * Revision 1.14 1995/03/30 12:18:17 quinn
+ * Fixed bug.
+ *
+ * Revision 1.13 1995/03/30 09:09:24 quinn
+ * Added state-handle and some support for asynchronous activities.
+ *
+ * Revision 1.12 1995/03/29 15:40:16 quinn
+ * Ongoing work. Statserv is now dynamic by default
+ *
+ * Revision 1.11 1995/03/28 09:16:21 quinn
+ * Added record packing to the search request
+ *
+ * Revision 1.10 1995/03/27 08:34:24 quinn
* Added dynamic server functionality.
* Released bindings to session.c (is now redundant)
*
new->state = ASSOC_UNINIT;
new->input_buffer = 0;
new->input_buffer_len = 0;
+ new->backend = 0;
if (cs_getproto(link) == CS_Z3950)
new->proto = PROTO_Z3950;
else
free(h->encode_buffer);
if (h->input_buffer)
free(h->input_buffer);
+ if (h->backend)
+ bend_close(h->backend);
free(h);
}
association *assoc = iochan_getdata(client);
bend_initrequest binitreq;
bend_initresult *binitres;
+ Odr_bitmask options, protocolVersion;
fprintf(stderr, "Got initRequest.\n");
if (req->implementationId)
return -1;
}
+ assoc->backend = binitres->handle;
apdup = &apdu;
apdu.which = Z_APDU_initResponse;
apdu.u.initResponse = &resp;
resp.referenceId = req->referenceId;
- resp.options = req->options; /* should check these */
- resp.protocolVersion = req->protocolVersion;
+ ODR_MASK_ZERO(&options);
+ if (ODR_MASK_GET(req->options, Z_Options_search))
+ ODR_MASK_SET(&options, Z_Options_search);
+ if (ODR_MASK_GET(req->options, Z_Options_present))
+ ODR_MASK_SET(&options, Z_Options_present);
+ if (ODR_MASK_GET(req->options, Z_Options_delSet))
+ ODR_MASK_SET(&options, Z_Options_delSet);
+ if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
+ ODR_MASK_SET(&options, Z_Options_namedResultSets);
+ resp.options = &options;
+ ODR_MASK_ZERO(&protocolVersion);
+ if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
+ ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_1);
+ if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
+ ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_2);
+ resp.protocolVersion = &protocolVersion;
assoc->maximumRecordSize = *req->maximumRecordSize;
/*
* This is not so hot. The big todo for ODR is dynamic memory allocation
resp.maximumRecordSize = &assoc->maximumRecordSize;
resp.result = &result;
resp.implementationId = "YAZ";
- resp.implementationName = "YAZ/Simple asynchronous test server";
- resp.implementationVersion = "$Revision: 1.10 $";
+ resp.implementationName = "Index Data/YAZ Generic Frontend Server";
+ resp.implementationVersion = "$Revision: 1.15 $";
resp.userInformationField = 0;
if (!z_APDU(assoc->encode, &apdup, 0))
{
}
freq.setname = setname;
freq.number = recno;
- if (!(fres = bend_fetch(&freq)))
+ if (!(fres = bend_fetch(a->backend, &freq, 0)))
{
*pres = Z_PRES_FAILURE;
return diagrec(a->proto, 2, "Backend interface problem");
association *assoc = iochan_getdata(client);
int nulint = 0;
bool_t sr = 1;
- int nrp;
bend_searchrequest bsrq;
bend_searchresult *bsrt;
oident *oent;
+ int next = 0;
+ static int none = Z_RES_NONE;
fprintf(stderr, "Got SearchRequest.\n");
apdup = &apdu;
if (!(oent = oid_getentbyoid(q->attributeSetId)) ||
oent->class != CLASS_ATTSET ||
oent->value != VAL_BIB1)
+ {
resp.records = diagrec(assoc->proto, 121, 0);
+ resp.resultCount = &nulint;
+ resp.numberOfRecordsReturned = &nulint;
+ resp.nextResultSetPosition = &nulint;
+ resp.searchStatus = &none;
+ resp.resultSetStatus = 0;
+ resp.presentStatus = 0;
+ }
}
if (!resp.records)
{
+ int toget;
+ Z_ElementSetNames *setnames;
+ int presst = 0;
+
bsrq.setname = req->resultSetName;
bsrq.replace_set = *req->replaceIndicator;
bsrq.num_bases = req->num_databaseNames;
bsrq.basenames = req->databaseNames;
bsrq.query = req->query;
- if (!(bsrt = bend_search(&bsrq)))
+ if (!(bsrt = bend_search(assoc->backend, &bsrq, 0)))
return -1;
else if (bsrt->errcode)
- resp.records = diagrec(assoc->proto, bsrt->errcode, bsrt->errstring);
+ {
+
+ resp.records = diagrec(assoc->proto, bsrt->errcode,
+ bsrt->errstring);
+ resp.resultCount = &nulint;
+ resp.numberOfRecordsReturned = &nulint;
+ resp.nextResultSetPosition = &nulint;
+ resp.searchStatus = &nulint;
+ resp.resultSetStatus = &none;
+ resp.presentStatus = 0;
+ }
else
+ {
resp.records = 0;
- resp.resultCount = &bsrt->hits;
- resp.numberOfRecordsReturned = &nulint;
- nrp = bsrt->hits ? 1 : 0;
- resp.nextResultSetPosition = &nrp;
- resp.searchStatus = &sr;
- resp.resultSetStatus = &sr;
- resp.presentStatus = 0;
- }
- else
- {
- resp.resultCount = &nulint;
- resp.numberOfRecordsReturned = &nulint;
- resp.nextResultSetPosition = &nulint;
- resp.searchStatus = &nulint;
- resp.resultSetStatus = 0;
+ resp.resultCount = &bsrt->hits;
+
+ /* how many records does the user agent want, then? */
+ if (bsrt->hits <= *req->smallSetUpperBound)
+ {
+ toget = bsrt->hits;
+ setnames = req->smallSetElementSetNames;
+ }
+ else if (bsrt->hits < *req->largeSetLowerBound)
+ {
+ toget = *req->mediumSetPresentNumber;
+ setnames = req->mediumSetElementSetNames;
+ }
+ else
+ toget = 0;
+
+ if (toget && !resp.records)
+ {
+ resp.records = pack_records(assoc, req->resultSetName, 1,
+ &toget, setnames, &next, &presst);
+ if (!resp.records)
+ return -1;
+ resp.numberOfRecordsReturned = &toget;
+ resp.nextResultSetPosition = &next;
+ resp.searchStatus = &sr;
+ resp.resultSetStatus = 0;
+ resp.presentStatus = &presst;
+ }
+ else
+ {
+ resp.numberOfRecordsReturned = &nulint;
+ resp.nextResultSetPosition = &next;
+ resp.searchStatus = &sr;
+ resp.resultSetStatus = 0;
+ resp.presentStatus = 0;
+ }
+ }
}
if (!z_APDU(assoc->encode, &apdup, 0))
projects / yaz-moved-to-github.git / blobdiff