More unifdef SLAPD_MULTIMASTER cleanup

[openldap] / servers / slapd / back-ldbm / index.c

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 13956bbc1ede3fe7517f9830805cbbb420c0b802..6cdec8db7ef9116ce0c61f6ef935fe55f7fda4db 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -115,9 +115,14 @@ int index_param(
                break;
 
        case LDAP_FILTER_APPROX:
-               if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) ) {
-                       goto done;
+               if ( desc->ad_type->sat_approx ) {
+                       if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) ) {
+                               goto done;
+                       }
+                       break;
                }
+
+               /* Use EQUALITY rule and index for approximate match */
                /* fall thru */
 
        case LDAP_FILTER_EQUALITY:
@@ -168,14 +173,9 @@ static int indexer(
        db = ldbm_cache_open( op->o_bd, dbname, LDBM_SUFFIX, LDBM_WRCREAT );
        
        if ( db == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( INDEX, ERR, 
-                          "index_read: Could not open db %s%s\n", dbname, LDBM_SUFFIX, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                    "<= index_read NULL (could not open %s%s)\n",
                        dbname, LDBM_SUFFIX, 0 );
-#endif
 
                return LDAP_OTHER;
        }
@@ -307,15 +307,9 @@ index_entry(
        Entry *e )
 {
        Attribute *ap = e->e_attrs;
-#ifdef NEW_LOGGING
-       LDAP_LOG( INDEX, ENTRY, 
-               "index_entry: %s (%s)%ld\n", opid == SLAP_INDEX_ADD_OP ? "add" : "del",
-               e->e_dn, e->e_id );
-#else
        Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
                opid == SLAP_INDEX_ADD_OP ? "add" : "del",
                e->e_id, e->e_dn );
-#endif
 
        /* add each attribute to the indexes */
        for ( ; ap != NULL; ap = ap->a_next ) {
@@ -324,13 +318,9 @@ index_entry(
                        e->e_id, opid );
        }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( INDEX, ENTRY, "index_entry: success\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
            opid == SLAP_INDEX_ADD_OP ? "add" : "del",
                e->e_id, e->e_dn );
-#endif
 
        return LDAP_SUCCESS;
 }