From: Adam Dickmeiss Date: Mon, 5 Jan 1998 09:04:57 +0000 (+0000) Subject: Fixed bugs in encoders/decoders - Not operator (!) missing. X-Git-Tag: YAZ.1.8~545 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=fb9fcec623beac87912604f17c680fad3def4a1b;p=yaz-moved-to-github.git Fixed bugs in encoders/decoders - Not operator (!) missing. --- diff --git a/CHANGELOG b/CHANGELOG index c7d37ac..8995a4c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ Possible compatibility problems with earlier versions marked with '*'. +Fixed bugs for encoders/decoders of extended services and +SearchInfoReport. + Implemented sub-tree feature for schemas. Sub-trees are referenced in *.abs-files. See explain.abs for an example of the use of this feature. diff --git a/asn/prt-acc.c b/asn/prt-acc.c index f3b8600..dfc024e 100644 --- a/asn/prt-acc.c +++ b/asn/prt-acc.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: prt-acc.c,v $ - * Revision 1.5 1995-09-29 17:11:53 quinn + * Revision 1.6 1998-01-05 09:04:57 adam + * Fixed bugs in encoders/decoders - Not operator (!) missing. + * + * Revision 1.5 1995/09/29 17:11:53 quinn * Smallish * * Revision 1.4 1995/09/27 15:02:41 quinn @@ -136,7 +139,7 @@ int z_ResponseUnit1(ODR o, Z_ResponseUnit1 **p, int opt) {-1, -1, -1, -1, 0} }; - if (odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p))) return opt && odr_ok(o); return odr_explicit(o, z_PromptId1, &(*p)->promptId, ODR_CONTEXT, 1, 0) && diff --git a/asn/prt-add.c b/asn/prt-add.c index 88a9807..eb23dbf 100644 --- a/asn/prt-add.c +++ b/asn/prt-add.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-1998, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: prt-add.c,v $ - * Revision 1.2 1997-04-30 08:52:02 quinn + * Revision 1.3 1998-01-05 09:04:57 adam + * Fixed bugs in encoders/decoders - Not operator (!) missing. + * + * Revision 1.2 1997/04/30 08:52:02 quinn * Null * * Revision 1.1 1996/10/10 11:52:18 quinn @@ -17,7 +20,7 @@ int z_ResultsByDBList (ODR o, Z_ResultsByDBList **p, int opt) { - if (odr_initmember (o, p, sizeof(**p))) + if (!odr_initmember (o, p, sizeof(**p))) return opt && odr_ok(o); if (odr_sequence_of (o, z_DatabaseName, &(*p)->elements, &(*p)->num)) @@ -48,7 +51,7 @@ int z_ResultsByDB_elem (ODR o, Z_ResultsByDB_elem **p, int opt) int z_ResultsByDB (ODR o, Z_ResultsByDB **p, int opt) { - if (odr_initmember (o, p, sizeof(**p))) + if (!odr_initmember (o, p, sizeof(**p))) return opt && odr_ok(o); if (odr_sequence_of (o, z_ResultsByDB_elem, &(*p)->elements, &(*p)->num)) @@ -111,7 +114,7 @@ int z_SearchInfoReport_elem (ODR o, Z_SearchInfoReport_elem **p, int opt) int z_SearchInfoReport (ODR o, Z_SearchInfoReport **p, int opt) { - if (odr_initmember (o, p, sizeof(**p))) + if (!odr_initmember (o, p, sizeof(**p))) return opt && odr_ok(o); if (odr_sequence_of (o, z_SearchInfoReport_elem, &(*p)->elements, &(*p)->num)) diff --git a/asn/prt-exd.c b/asn/prt-exd.c index 6ab6af4..d32228b 100644 --- a/asn/prt-exd.c +++ b/asn/prt-exd.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: prt-exd.c,v $ - * Revision 1.5 1997-04-30 08:52:02 quinn + * Revision 1.6 1998-01-05 09:04:57 adam + * Fixed bugs in encoders/decoders - Not operator (!) missing. + * + * Revision 1.5 1997/04/30 08:52:02 quinn * Null * * Revision 1.4 1996/10/10 12:35:12 quinn @@ -265,7 +268,7 @@ int z_IUSuppliedRecords_elem (ODR o, Z_IUSuppliedRecords_elem **p, int opt) int z_IUSuppliedRecords (ODR o, Z_IUSuppliedRecords **p, int opt) { - if (odr_initmember (o, p, sizeof(**p))) + if (!odr_initmember (o, p, sizeof(**p))) return opt && odr_ok(o); if (odr_sequence_of (o, z_IUSuppliedRecords_elem, &(*p)->elements, &(*p)->num)) diff --git a/asn/prt-ext.c b/asn/prt-ext.c index aac6bfc..4dda9d6 100644 --- a/asn/prt-ext.c +++ b/asn/prt-ext.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: prt-ext.c,v $ - * Revision 1.13 1997-05-14 06:53:22 adam + * Revision 1.14 1998-01-05 09:04:57 adam + * Fixed bugs in encoders/decoders - Not operator (!) missing. + * + * Revision 1.13 1997/05/14 06:53:22 adam * C++ support. * * Revision 1.12 1997/04/30 08:52:02 quinn @@ -112,7 +115,7 @@ int z_External(ODR o, Z_External **p, int opt) {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, z_OPACRecord}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_searchResult1, z_SearchInfoReport}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update, z_IUUpdate}, {-1, -1, -1, -1, 0} };