From f786c24ecec337c9055586cca0507c7e7bbe81f3 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 19 Jan 2010 14:13:13 +0100 Subject: [PATCH] GFS: step_size, term_position, statuses type int Members step-size, term_position from bend_scan_rr changed from Odr_int to int. Member statuses from bend_delete_rr changed from Odr_int to int. --- include/yaz/backend.h | 6 +++--- src/seshigh.c | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/yaz/backend.h b/include/yaz/backend.h index d9b45d8..51f1ab7 100644 --- a/include/yaz/backend.h +++ b/include/yaz/backend.h @@ -137,8 +137,8 @@ typedef struct bend_scan_rr { ODR stream; /**< encoding stream (input) */ ODR print; /**< printing stream (input) */ - Odr_int *step_size; /**< step size */ - Odr_int term_position; /**< desired index of term in result list/returned */ + int *step_size; /**< step size */ + int term_position; /**< desired index of term in result list/returned */ int num_entries; /**< number of entries requested/returned */ /* scan term entries. The called handler does not have @@ -181,7 +181,7 @@ typedef struct bend_delete_rr { char **setnames; Z_ReferenceId *referenceId; int delete_status; /**< status for the whole operation */ - Odr_int *statuses; /**< status each set - indexed as setnames */ + int *statuses; /**< status each set - indexed as setnames */ ODR stream; ODR print; } bend_delete_rr; diff --git a/src/seshigh.c b/src/seshigh.c index cdc9fdc..eea76c1 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1244,6 +1244,7 @@ static void srw_bend_scan(association *assoc, request *req, srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); if (srw_res->num_diagnostics == 0 && assoc->init) { + int step_size = 0; struct scan_entry *save_entries; bend_scan_rr *bsrr = (bend_scan_rr *) @@ -1254,14 +1255,14 @@ static void srw_bend_scan(association *assoc, request *req, bsrr->num_entries = srw_req->maximumTerms ? odr_int_to_int(*srw_req->maximumTerms) : 10; bsrr->term_position = srw_req->responsePosition ? - *srw_req->responsePosition : 1; + odr_int_to_int(*srw_req->responsePosition) : 1; bsrr->errcode = 0; bsrr->errstring = 0; bsrr->referenceId = 0; bsrr->stream = assoc->encode; bsrr->print = assoc->print; - bsrr->step_size = odr_intdup(assoc->decode, 0); + bsrr->step_size = &step_size; bsrr->entries = 0; bsrr->setname = 0; @@ -2917,6 +2918,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) bend_scan_rr *bsrr = (bend_scan_rr *) odr_malloc(assoc->encode, sizeof(*bsrr)); struct scan_entry *save_entries; + int step_size = 0; yaz_log(log_requestdetail, "Got ScanRequest"); @@ -2925,9 +2927,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) res->referenceId = req->referenceId; /* if step is absent, set it to 0 */ - res->stepSize = odr_intdup(assoc->encode, 0); if (req->stepSize) - *res->stepSize = *req->stepSize; + step_size = odr_int_to_int(*req->stepSize); res->scanStatus = scanStatus; res->numberOfEntriesReturned = numberOfEntriesReturned; @@ -2956,7 +2957,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) bsrr->referenceId = req->referenceId; bsrr->stream = assoc->encode; bsrr->print = assoc->print; - bsrr->step_size = res->stepSize; + bsrr->step_size = &step_size; bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo, yaz_oid_userinfo_scan_set, 1, 0); bsrr->entries = 0; @@ -2988,7 +2989,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) log_scan_term_level(log_requestdetail, req->termListAndStartPoint, bsrr->attributeset); bsrr->term_position = req->preferredPositionInResponse ? - *req->preferredPositionInResponse : 1; + odr_int_to_int(*req->preferredPositionInResponse) : 1; ((int (*)(void *, bend_scan_rr *)) (*assoc->init->bend_scan))(assoc->backend, bsrr); @@ -3006,11 +3007,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) *scanStatus = Z_Scan_partial_5; else *scanStatus = Z_Scan_success; + res->stepSize = odr_intdup(assoc->encode, step_size); ents->entries = tab; ents->num_entries = bsrr->num_entries; res->numberOfEntriesReturned = odr_intdup(assoc->encode, ents->num_entries); - res->positionOfTerm = &bsrr->term_position; + res->positionOfTerm = odr_intdup(assoc->encode, bsrr->term_position); for (i = 0; i < bsrr->num_entries; i++) { Z_Entry *e; @@ -3209,7 +3211,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb) bdrr->statuses = 0; if (bdrr->num_setnames > 0) { - bdrr->statuses = (Odr_int*) + bdrr->statuses = (int*) odr_malloc(assoc->encode, sizeof(*bdrr->statuses) * bdrr->num_setnames); for (i = 0; i < bdrr->num_setnames; i++) @@ -3239,7 +3241,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb) (Z_ListStatus *) odr_malloc(assoc->encode, sizeof(**res->deleteListStatuses->elements)); - res->deleteListStatuses->elements[i]->status = bdrr->statuses+i; + res->deleteListStatuses->elements[i]->status = + odr_intdup(assoc->encode, bdrr->statuses[i]); res->deleteListStatuses->elements[i]->id = odr_strdup(assoc->encode, bdrr->setnames[i]); } -- 1.7.10.4