From 47b18c9a512d7e5f1f1ed401c455a9e65656382a Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 1 Mar 2003 05:17:44 +0000 Subject: [PATCH] SLAP_NVALUES: index normalized values --- servers/slapd/back-bdb/index.c | 10 ++++++++-- servers/slapd/back-bdb/modify.c | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c index dd695783df..1120054eb3 100644 --- a/servers/slapd/back-bdb/index.c +++ b/servers/slapd/back-bdb/index.c @@ -356,8 +356,14 @@ bdb_index_entry( /* add each attribute to the indexes */ for ( ; ap != NULL; ap = ap->a_next ) { - rc = bdb_index_values( be, txn, - ap->a_desc, ap->a_vals, e->e_id, op ); +#ifdef SLAP_NVALUES + rc = bdb_index_values( be, txn, ap->a_desc, + ap->a_nvals ? ap->a_nvals : ap->a_vals, + e->e_id, op ); +#else + rc = bdb_index_values( be, txn, ap->a_desc, + ap->a_vals, e->e_id, op ); +#endif if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 167938a960..9fe2b47ef6 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -209,7 +209,12 @@ int bdb_modify_internal( /* start with deleting the old index entries */ for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) { if ( ap->a_flags & SLAP_ATTR_IXDEL ) { - rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals, + rc = bdb_index_values( be, tid, ap->a_desc, +#ifdef SLAP_NVALUES + ap->a_nvals ? ap->a_nvals : ap->a_vals, +#else + ap->a_vals, +#endif e->e_id, SLAP_INDEX_DELETE_OP ); if ( rc != LDAP_SUCCESS ) { attrs_free( e->e_attrs ); @@ -232,7 +237,12 @@ int bdb_modify_internal( /* add the new index entries */ for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) { if (ap->a_flags & SLAP_ATTR_IXADD) { - rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals, + rc = bdb_index_values( be, tid, ap->a_desc, +#ifdef SLAP_NVALUES + ap->a_nvals ? ap->a_nvals : ap->a_vals, +#else + ap->a_vals, +#endif e->e_id, SLAP_INDEX_ADD_OP ); if ( rc != LDAP_SUCCESS ) { attrs_free( e->e_attrs ); -- 2.39.5