First round of imports from HEAD

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

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index f5078c0051313dffcc2ff3e3940e31349b07cba6..8abb05195e80710907e5933299623f24c792106e 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -1,7 +1,7 @@
 /* index.c - routines for dealing with attribute indexes */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -32,14 +32,14 @@ static slap_mask_t index_mask(
                return mask;
        }
 
-       /* If there is a language tag, did we ever index the base
+       /* If there is a tagging option, did we ever index the base
         * type? If so, check for mask, otherwise it's not there.
         */
-       if( slap_ad_is_lang( desc ) && desc != desc->ad_type->sat_ad ) {
-               /* has language tag */
+       if( slap_ad_is_tagged( desc ) && desc != desc->ad_type->sat_ad ) {
+               /* has tagging option */
                attr_mask( be->be_private, desc->ad_type->sat_ad, &mask );
 
-               if( mask && ( mask ^ SLAP_INDEX_NOLANG ) ) {
+               if( mask && ( mask ^ SLAP_INDEX_NOTAGS ) ) {
                        *atname = desc->ad_type->sat_cname;
                        *dbname = desc->ad_type->sat_cname.bv_val;
                        return mask;
@@ -230,7 +230,7 @@ static int indexer(
 static int index_at_values(
        Backend *be,
        AttributeType *type,
-       struct berval *lang,
+       struct berval *tags,
        BerVarray vals,
        ID id,
        int op )
@@ -240,7 +240,7 @@ static int index_at_values(
        if( type->sat_sup ) {
                /* recurse */
                (void) index_at_values( be,
-                       type->sat_sup, lang,
+                       type->sat_sup, tags,
                        vals, id, op );
        }
 
@@ -256,12 +256,12 @@ static int index_at_values(
                        mask );
        }
 
-       if( lang->bv_len ) {
+       if( tags->bv_len ) {
                AttributeDescription *desc;
 
                mask = 0;
 
-               desc = ad_find_lang(type, lang);
+               desc = ad_find_tags(type, tags);
                if( desc ) {
                        attr_mask( be->be_private, desc, &mask );
                }
@@ -284,7 +284,7 @@ int index_values(
        int op )
 {
        (void) index_at_values( be,
-               desc->ad_type, &desc->ad_lang,
+               desc->ad_type, &desc->ad_tags,
                vals, id, op );
 
        return LDAP_SUCCESS;