From e8f88ae9eb36023af537c24847744f57e6bf6c4e Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 1 Dec 2009 22:03:58 +0100 Subject: [PATCH] Update to use Odr_int --- src/filter_multi.cpp | 4 ++-- src/filter_session_shared.cpp | 6 ++++-- src/filter_sru_to_z3950.cpp | 15 ++++++++------- src/gduutil.cpp | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/filter_multi.cpp b/src/filter_multi.cpp index 33367e7..f728724 100644 --- a/src/filter_multi.cpp +++ b/src/filter_multi.cpp @@ -976,7 +976,7 @@ void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req) { ScanTermInfo my; - int *occur = ent->u.termInfo->globalOccurrences; + Odr_int *occur = ent->u.termInfo->globalOccurrences; my.m_count = occur ? *occur : 0; if (ent->u.termInfo->term->which == Z_Term_general) @@ -1017,7 +1017,7 @@ void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req) { ScanTermInfo my; - int *occur = ent->u.termInfo->globalOccurrences; + Odr_int *occur = ent->u.termInfo->globalOccurrences; my.m_count = occur ? *occur : 0; if (ent->u.termInfo->term->which == Z_Term_general) diff --git a/src/filter_session_shared.cpp b/src/filter_session_shared.cpp index cd6a237..056a568 100644 --- a/src/filter_session_shared.cpp +++ b/src/filter_session_shared.cpp @@ -846,7 +846,8 @@ void yf::SessionShared::Frontend::present(mp::Package &package, Z_APDU *f_apdu_res = odr.create_presentResponse(apdu_req, 0, 0); Z_PresentResponse *f_resp = f_apdu_res->u.presentResponse; - yaz_log(YLOG_LOG, "Found %d+%d records in cache %p", + yaz_log(YLOG_LOG, "Found " ODR_INT_PRINTF "+" ODR_INT_PRINTF + " records in cache %p", *req->resultSetStartPoint, *req->numberOfRecordsRequested, &found_set->m_record_cache); @@ -897,7 +898,8 @@ void yf::SessionShared::Frontend::present(mp::Package &package, if (b_resp->records && b_resp->records->which == Z_Records_DBOSD) { - yaz_log(YLOG_LOG, "Adding %d+%d records to cache %p", + yaz_log(YLOG_LOG, "Adding " ODR_INT_PRINTF "+" ODR_INT_PRINTF + " records to cache %p", *req->resultSetStartPoint, *f_resp->numberOfRecordsReturned, &found_set->m_record_cache); diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp index fea86c1..7ccebd3 100644 --- a/src/filter_sru_to_z3950.cpp +++ b/src/filter_sru_to_z3950.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include -#include +/* #include */ #include namespace mp = metaproxy_1; @@ -538,8 +538,7 @@ bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, // Finally, roll on and srw'fy number of records sru_pdu_res->u.response->numberOfRecords - = (int *) odr_malloc(odr_en, sizeof(int *)); - *(sru_pdu_res->u.response->numberOfRecords) = *(sr->resultCount); + = odr_intdup(odr_en, *sr->resultCount); // srw'fy nextRecordPosition //sru_pdu_res->u.response->nextRecordPosition @@ -643,10 +642,12 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, // z3950'fy number of records requested // protect against requesting records out of range - *apdu->u.presentRequest->numberOfRecordsRequested - = std::min(max_recs, - *sru_pdu_res->u.response->numberOfRecords - start + 1); - + if (max_recs < *sru_pdu_res->u.response->numberOfRecords - start + 1) + *apdu->u.presentRequest->numberOfRecordsRequested = max_recs; + else + *apdu->u.presentRequest->numberOfRecordsRequested = + *sru_pdu_res->u.response->numberOfRecords - start + 1; + // z3950'fy recordPacking int record_packing = Z_SRW_recordPacking_XML; if (sr_req->recordPacking && 's' == *(sr_req->recordPacking)) diff --git a/src/gduutil.cpp b/src/gduutil.cpp index 4993074..976b091 100644 --- a/src/gduutil.cpp +++ b/src/gduutil.cpp @@ -139,7 +139,7 @@ static void dump_opt_string(std::ostream& os, const char *s) os << "-"; } -static void dump_opt_int(std::ostream& os, const int *i) +static void dump_opt_int(std::ostream& os, const Odr_int *i) { os << " "; if (i) -- 1.7.10.4