X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-server-sr.cpp;fp=src%2Fyaz-z-server-sr.cpp;h=e1943069519a08e6678cebaa8995f3f6df79d706;hb=711105a336b155f2b7f098cf84f2e30952cb8588;hp=08f1a39d6df0511bf7871be2c61769c15beaef07;hpb=b56e6a2a7d6b37a72e3be0973747feb977f82a70;p=yazpp-moved-to-github.git diff --git a/src/yaz-z-server-sr.cpp b/src/yaz-z-server-sr.cpp index 08f1a39..e194306 100644 --- a/src/yaz-z-server-sr.cpp +++ b/src/yaz-z-server-sr.cpp @@ -111,15 +111,15 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s, { bool_t *sr = (bool_t *)odr_malloc (odr_encode(), sizeof(*sr)); *sr = 1; - + int toget = 0; - + Z_RecordComposition comp, *compp = 0; int hits = *res->resultCount; - + Odr_int *nulint = (Odr_int *)odr_malloc (odr_encode(), sizeof(*nulint)); *nulint = 0; - + comp.which = Z_RecordComp_simple; /* how many records does the user agent want, then? */ if (hits <= *req->smallSetUpperBound) @@ -136,14 +136,14 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s, if ((comp.u.simple = req->mediumSetElementSetNames)) compp = ∁ } - + if (toget && !res->records) { res->presentStatus = (Odr_int *) odr_malloc (odr_encode(), sizeof(Odr_int)); *res->presentStatus = Z_PresentStatus_success; res->records = - pack_records(s, req->resultSetName, 1, toget, compp, + pack_records(s, req->resultSetName, 1, toget, compp, res->nextResultSetPosition, res->presentStatus, req->preferredRecordSyntax); @@ -171,7 +171,7 @@ void Yaz_Facility_Retrieval::fetch_via_present (Z_Server *s, Z_PresentResponse *res) { res->records = - pack_records (s, req->resultSetId,*req->resultSetStartPoint, + pack_records (s, req->resultSetId,*req->resultSetStartPoint, *req->numberOfRecordsRequested, req->recordComposition, res->nextResultSetPosition, @@ -187,7 +187,7 @@ int Yaz_Facility_Retrieval::init(Z_Server *s, Z_InitRequest *initRequest, { Z_Options *req = initRequest->options; Z_Options *res = initResponse->options; - + if (ODR_MASK_GET(req, Z_Options_search)) ODR_MASK_SET(res, Z_Options_search); if (ODR_MASK_GET(req, Z_Options_present)) @@ -208,7 +208,7 @@ ODR Yaz_Facility_Retrieval::odr_decode() } int Yaz_Facility_Retrieval::recv(Z_Server *s, Z_APDU *apdu_request) -{ +{ Z_APDU *apdu_response; m_odr_encode = s->odr_encode(); m_odr_decode = s->odr_decode();