X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=9bf39cae82cc5c75ed234d43c00bb0a704df87f8;hp=b05860f697c9365dd5ac66df0ea9402b253d4e47;hb=002e8d5e6cdb9f188fd91df930b6cc763f50f96d;hpb=8981acaf5c0aaf34a70f01178f22591bb8b3e19d

diff --git a/src/seshigh.c b/src/seshigh.c
index b05860f..9bf39ca 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -26,6 +26,7 @@
  *
  */
 
+#include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
@@ -126,6 +127,16 @@ static void wr_diag(WRBUF w, int error, const char *addinfo)
     wrbuf_puts(w, " ");    
 }
 
+static int odr_int_to_int(Odr_int v)
+{
+    if (v >= INT_MAX)
+        return INT_MAX;
+    else if (v <= INT_MIN)
+        return INT_MIN;
+    else
+        return (int) v;
+}
+
 /*
  * Create and initialize a new association-handle.
  *  channel  : iochannel for the current line.
@@ -222,8 +233,8 @@ void destroy_association(association *h)
 static void do_close_req(association *a, int reason, char *message,
                          request *req)
 {
-    Z_APDU apdu;
-    Z_Close *cls = zget_Close(a->encode);
+    Z_APDU *apdu = zget_APDU(a->encode, Z_APDU_close);
+    Z_Close *cls = apdu->u.close;
     
     /* Purge request queue */
     while (request_deq(&a->incoming));
@@ -232,11 +243,9 @@ static void do_close_req(association *a, int reason, char *message,
     {
         yaz_log(log_requestdetail, "Sending Close PDU, reason=%d, message=%s",
             reason, message ? message : "none");
-        apdu.which = Z_APDU_close;
-        apdu.u.close = cls;
         *cls->closeReason = reason;
         cls->diagnosticInformation = message;
-        process_z_response(a, req, &apdu);
+        process_z_response(a, req, apdu);
         iochan_settimeout(a->client_chan, 20);
     }
     else
@@ -527,7 +536,7 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S
         {
             Z_IdAuthentication *auth = (Z_IdAuthentication *)
                 odr_malloc(assoc->decode, sizeof(*auth));
-            int len;
+            size_t len;
 
             len = strlen(sr->username) + 1;
             if (sr->password) 
@@ -837,7 +846,6 @@ static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset,
     return 0;
 }
 
-
 static void srw_bend_search(association *assoc, request *req,
                             Z_SRW_PDU *sr,
                             Z_SRW_PDU *res,
@@ -962,8 +970,10 @@ static void srw_bend_search(association *assoc, request *req,
             }
             else
             {
-                int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0;
-                int start = srw_req->startRecord ? *srw_req->startRecord : 1;
+                int number = srw_req->maximumRecords ?
+                    odr_int_to_int(*srw_req->maximumRecords) : 0;
+                int start = srw_req->startRecord ?
+                    odr_int_to_int(*srw_req->startRecord) : 1;
                 
                 yaz_log(log_requestdetail, "Request to pack %d+%d out of "
                         ODR_INT_PRINTF,
@@ -992,7 +1002,7 @@ static void srw_bend_search(association *assoc, request *req,
                     int i;
                     int ok = 1;
                     if (start + number > rr.hits)
-                        number = rr.hits - start + 1;
+                        number = odr_int_to_int(rr.hits) - start + 1;
                     
                     /* Call bend_present if defined */
                     if (assoc->init->bend_present)
@@ -1235,6 +1245,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 *)
@@ -1243,16 +1254,16 @@ static void srw_bend_scan(association *assoc, request *req,
         bsrr->basenames = &srw_req->database;
 
         bsrr->num_entries = srw_req->maximumTerms ?
-            *srw_req->maximumTerms : 10;
+            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;
 
@@ -2280,13 +2291,15 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options);
 
     if (*req->maximumRecordSize < assoc->maximumRecordSize)
-        assoc->maximumRecordSize = *req->maximumRecordSize;
+        assoc->maximumRecordSize = odr_int_to_int(*req->maximumRecordSize);
 
     if (*req->preferredMessageSize < assoc->preferredMessageSize)
-        assoc->preferredMessageSize = *req->preferredMessageSize;
+        assoc->preferredMessageSize = odr_int_to_int(*req->preferredMessageSize);
 
-    resp->preferredMessageSize = &assoc->preferredMessageSize;
-    resp->maximumRecordSize = &assoc->maximumRecordSize;
+    resp->preferredMessageSize =
+        odr_intdup(assoc->encode, assoc->preferredMessageSize);
+    resp->maximumRecordSize = 
+        odr_intdup(assoc->encode, assoc->maximumRecordSize);
 
     resp->implementationId = odr_prepend(assoc->encode,
                 assoc->init->implementation_id,
@@ -2407,7 +2420,8 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start,
                                Z_ReferenceId *referenceId,
                                Odr_oid *oid, int *errcode)
 {
-    int recno, total_length = 0, toget = *num, dumped_records = 0;
+    int recno, total_length = 0, dumped_records = 0;
+    int toget = odr_int_to_int(*num);
     Z_Records *records =
         (Z_Records *) odr_malloc(a->encode, sizeof(*records));
     Z_NamePlusRecordList *reclist =
@@ -2424,10 +2438,9 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start,
     *next = 0;
 
     yaz_log(log_requestdetail, "Request to pack " ODR_INT_PRINTF "+%d %s", start, toget, setname);
-    yaz_log(log_requestdetail, "pms=" ODR_INT_PRINTF
-            ", mrs=" ODR_INT_PRINTF, a->preferredMessageSize,
+    yaz_log(log_requestdetail, "pms=%d, mrs=%d", a->preferredMessageSize,
         a->maximumRecordSize);
-    for (recno = start; reclist->num_records < toget; recno++)
+    for (recno = odr_int_to_int(start); reclist->num_records < toget; recno++)
     {
         bend_fetch_rr freq;
         Z_NamePlusRecord *thisrec;
@@ -2521,7 +2534,7 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start,
             else /* too big entirely */
             {
                 yaz_log(log_requestdetail, "Record > maxrcdsz "
-                        "this=%d max=" ODR_INT_PRINTF,
+                        "this=%d max=%d",
                         this_length, a->maximumRecordSize);
                 reclist->records[reclist->num_records] =
                     surrogatediagrec(a, freq.basename, 17, 0);
@@ -2644,7 +2657,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
     Odr_int *nulint = odr_intdup(assoc->encode, 0);
     Odr_int *next = odr_intdup(assoc->encode, 0);
     Odr_int *none = odr_intdup(assoc->encode, Z_SearchResponse_none);
-    int returnedrecs = 0;
+    Odr_int returnedrecs = 0;
 
     apdu->which = Z_APDU_searchResponse;
     apdu->u.searchResponse = resp;
@@ -2708,7 +2721,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
                     nmem_malloc(reqb->request_mem, sizeof(*bprr));
                 bprr->setname = req->resultSetName;
                 bprr->start = 1;
-                bprr->number = *toget;
+                bprr->number = odr_int_to_int(*toget);
                 bprr->format = req->preferredRecordSyntax;
                 bprr->comp = compp;
                 bprr->referenceId = req->referenceId;
@@ -2777,7 +2790,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
             wrbuf_printf(wr, "ERROR %d", bsrt->errcode);
         else
             wrbuf_printf(wr, "OK " ODR_INT_PRINTF, bsrt->hits);
-        wrbuf_printf(wr, " %s 1+%d ",
+        wrbuf_printf(wr, " %s 1+" ODR_INT_PRINTF " ",
                      req->resultSetName, returnedrecs);
         yaz_query_to_wrbuf(wr, req->query);
         
@@ -2822,8 +2835,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb)
         bend_present_rr *bprr = (bend_present_rr *)
             nmem_malloc(reqb->request_mem, sizeof(*bprr));
         bprr->setname = req->resultSetId;
-        bprr->start = *req->resultSetStartPoint;
-        bprr->number = *req->numberOfRecordsRequested;
+        bprr->start = odr_int_to_int(*req->resultSetStartPoint);
+        bprr->number = odr_int_to_int(*req->numberOfRecordsRequested);
         bprr->format = req->preferredRecordSyntax;
         bprr->comp = req->recordComposition;
         bprr->referenceId = req->referenceId;
@@ -2906,6 +2919,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");
 
@@ -2914,9 +2928,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;
@@ -2940,12 +2953,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb)
     bsrr->errstring = 0;
     bsrr->num_bases = req->num_databaseNames;
     bsrr->basenames = req->databaseNames;
-    bsrr->num_entries = *req->numberOfTermsRequested;
+    bsrr->num_entries = odr_int_to_int(*req->numberOfTermsRequested);
     bsrr->term = req->termListAndStartPoint;
     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;
@@ -2977,7 +2990,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);
@@ -2995,11 +3008,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;
@@ -3193,12 +3207,12 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb)
                 req->resultSetList[i]);
     bdrr->stream = assoc->encode;
     bdrr->print = assoc->print;
-    bdrr->function = *req->deleteFunction;
+    bdrr->function = odr_int_to_int(*req->deleteFunction);
     bdrr->referenceId = req->referenceId;
     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++)
@@ -3228,7 +3242,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]);
         }