fix for select_backend suggested G. Gombas (ITS 1090)

[openldap] / servers / slapd / str2filter.c

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 01b1a71bdc1a25de6af908fdb64fdca04035774d..e0907a2534a07c43d3580cf0b394f387922f977c 100644 (file)
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -27,7 +27,13 @@ str2filter( const char *str )
        Filter  *f = NULL;
        char    *end, *freeme;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2filter: \"%s\"\n", str ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 );
+#endif
+
 
        if ( str == NULL || *str == '\0' ) {
                return( NULL );
@@ -47,32 +53,56 @@ str2filter( const char *str )
                str++;
                switch ( *str ) {
                case '&':
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  AND\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "str2filter: AND\n",
                            0, 0, 0 );
+#endif
+
 
                        str++;
                        f = str2list( str, LDAP_FILTER_AND );
                        break;
 
                case '|':
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  OR\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "put_filter: OR\n",
                            0, 0, 0 );
+#endif
+
 
                        str++;
                        f = str2list( str, LDAP_FILTER_OR );
                        break;
 
                case '!':
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  NOT\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "put_filter: NOT\n",
                            0, 0, 0 );
+#endif
+
 
                        str++;
                        f = str2list( str, LDAP_FILTER_NOT );
                        break;
 
                default:
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  simple\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "str2filter: simple\n",
                            0, 0, 0 );
+#endif
+
 
                        f = str2simple( str );
                        break;
@@ -81,8 +111,14 @@ str2filter( const char *str )
                break;
 
        default:        /* assume it's a simple type=value filter */
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "str2filter: default\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "str2filter: default\n", 0, 0,
                    0 );
+#endif
+
 
                f = str2simple( str );
                break;
@@ -104,7 +140,13 @@ str2list( const char *str, unsigned long ftype )
        char    *next;
        char    save;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2list: \"%s\"\n", str ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2list \"%s\"\n", str, 0, 0 );
+#endif
+
 
        f = (Filter *) ch_calloc( 1, sizeof(Filter) );
        f->f_choice = ftype;
@@ -145,12 +187,16 @@ str2simple( const char *str )
        Filter          *f;
        char            *s;
        char            *value, savechar;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
        int                     rc;
        const char              *text;
-#endif
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2simple:  \"%s\"\n", str ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2simple \"%s\"\n", str, 0, 0 );
+#endif
+
 
        if ( (s = strchr( str, '=' )) == NULL ) {
                return( NULL );
@@ -188,7 +234,6 @@ str2simple( const char *str )
                        f->f_choice = LDAP_FILTER_PRESENT;
                } else {
                        f->f_choice = LDAP_FILTER_SUBSTRINGS;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                        f->f_sub = ch_calloc( 1, sizeof( SubstringsAssertion ) );
                        rc = slap_str2ad( str, &f->f_sub_desc, &text );
                        if( rc != LDAP_SUCCESS ) {
@@ -196,9 +241,6 @@ str2simple( const char *str )
                                *(value-1) = '=';
                                return NULL;
                        }
-#else
-                       f->f_sub_type = ch_strdup( str );
-#endif
                        if ( str2subvals( value, f ) != 0 ) {
                                filter_free( f );
                                *(value-1) = '=';
@@ -211,18 +253,13 @@ str2simple( const char *str )
        }
 
        if ( f->f_choice == LDAP_FILTER_PRESENT ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                rc = slap_str2ad( str, &f->f_desc, &text );
                if( rc != LDAP_SUCCESS ) {
                        filter_free( f );
                        *(value-1) = '=';
                        return NULL;
                }
-#else
-               f->f_type = ch_strdup( str );
-#endif
        } else {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                char *tmp;
 
                f->f_ava = ch_calloc( 1, sizeof( AttributeAssertion ) );
@@ -237,12 +274,6 @@ str2simple( const char *str )
                tmp = ch_strdup( value );
                ldap_pvt_filter_value_unescape( tmp );
                f->f_av_value = ber_bvstr( tmp );
-#else
-               f->f_avtype = ch_strdup( str );
-               f->f_avvalue.bv_val = ch_strdup( value );
-               ldap_pvt_filter_value_unescape( f->f_avvalue.bv_val );
-               f->f_avvalue.bv_len = strlen( value );
-#endif
        }
 
        *s = savechar;
@@ -257,7 +288,13 @@ str2subvals( const char *in, Filter *f )
        char    *nextstar, *val, *freeme;
        int     gotstar;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2subvals: \"%s\"\n", in ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", in, 0, 0 );
+#endif
+
 
        if( in == NULL ) return 0;