cvs: php4 /ext/yaz php_yaz.c

dickmeiss Tue Jan 1 09:09:03 2002 EDT Modified files: /php4/ext/yaz php_yaz.c Log: Removal of non-essential parameters for non-piggyback search. Index: php4/ext/yaz/php_yaz.c diff -u php4/ext/yaz/php_yaz.c:1.36 php4/ext/yaz/php_yaz.c:1.37 --- php4/ext/yaz/php_yaz.c:1.36 Tue Dec 11 10:30:55 2001 +++ php4/ext/yaz/php_yaz.c Tue Jan 1 09:09:02 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.c,v 1.36 2001/12/11 15:30:55 sebastian Exp $ */ +/* $Id: php_yaz.c,v 1.37 2002/01/01 14:09:02 dickmeiss Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -764,6 +764,7 @@ /* 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 @@ 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);