Removal of non-essential parameters for non-piggyback search.

diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index a9fc74784ef21286dfa55ace0d50a0a85e30d33e..ae31966f19aca3542c3b11f71a6dc9ecfc267de0 100644 (file)
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -764,6 +764,7 @@ static int send_search (Yaz_Association t)
        
        /* resultSetPrepare (req, t, req->cur_pa); */
        if (t->resultSetStartPoint == 1 && t->piggyback  &&
+            t->numberOfRecordsRequested &&
                (t->sort_criteria == 0 || *t->sort_criteria == 0) )
        {
                sreq->largeSetLowerBound = odr_malloc (t->odr_out, sizeof(int));
@@ -779,27 +780,18 @@ static int send_search (Yaz_Association t)
                        sreq->mediumSetElementSetNames = esn;
                        sreq->smallSetElementSetNames = esn;
                }
-       }
-       else
-       {
-               sreq->smallSetUpperBound = odr_malloc (t->odr_out, sizeof(int));
-               *sreq->smallSetUpperBound = 0;
-               sreq->largeSetLowerBound = odr_malloc (t->odr_out, sizeof(int));
-               *sreq->largeSetLowerBound = 1;
-               sreq->mediumSetPresentNumber = odr_malloc (t->odr_out, sizeof(int));
-               *sreq->mediumSetPresentNumber = 0;
-       }
-       sreq->query = r->query;
-       if (t->preferredRecordSyntax && *t->preferredRecordSyntax)
-       {
-               struct oident ident;
+               if (t->preferredRecordSyntax && *t->preferredRecordSyntax)
+               {
+                       struct oident ident;
                
-               ident.proto = PROTO_Z3950;
-               ident.oclass = CLASS_RECSYN;
-               ident.value = oid_getvalbyname (t->preferredRecordSyntax);
-               sreq->preferredRecordSyntax =
-                       odr_oiddup (t->odr_out, oid_getoidbyent (&ident));
+                       ident.proto = PROTO_Z3950;
+                       ident.oclass = CLASS_RECSYN;
+                       ident.value = oid_getvalbyname (t->preferredRecordSyntax);
+                       sreq->preferredRecordSyntax =
+                               odr_oiddup (t->odr_out, oid_getoidbyent (&ident));
+               }
        }
+       sreq->query = r->query;
        sreq->databaseNames = set_DatabaseNames (t, &sreq->num_databaseNames);
 
        send_APDU (t, apdu);