mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLAP_NVALUES: index normalized values

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-03-01 05:17:44 +00:00
parent 2bd7c30d5f
commit 47b18c9a51
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/back-bdb/index.c
View File

@ -356,8 +356,14 @@ bdb_index_entry(
/* add each attribute to the indexes */ /* add each attribute to the indexes */
for ( ; ap != NULL; ap = ap->a_next ) { for ( ; ap != NULL; ap = ap->a_next ) {
rc = bdb_index_values( be, txn, #ifdef SLAP_NVALUES
ap->a_desc, ap->a_vals, e->e_id, op ); 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 ) { if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING

14
servers/slapd/back-bdb/modify.c
View File

@ -209,7 +209,12 @@ int bdb_modify_internal(
/* start with deleting the old index entries */ /* start with deleting the old index entries */
for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) { for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
if ( ap->a_flags & SLAP_ATTR_IXDEL ) { 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 ); e->e_id, SLAP_INDEX_DELETE_OP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
attrs_free( e->e_attrs ); attrs_free( e->e_attrs );
@ -232,7 +237,12 @@ int bdb_modify_internal(
/* add the new index entries */ /* add the new index entries */
for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) { for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
if (ap->a_flags & SLAP_ATTR_IXADD) { 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 ); e->e_id, SLAP_INDEX_ADD_OP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
attrs_free( e->e_attrs ); attrs_free( e->e_attrs );