cleanup error messages

[openldap] / servers / slapd / back-sql / entry-id.c

diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index bdb58b986c57362e23062e5731c82a38209b877c..e1644e2f4011a20216dd7ddbbea1ec040d6a096f 100644 (file)
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -25,14 +25,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include "ac/string.h"
+
 #include "lber_pvt.h"
 #include "ldap_pvt.h"
 #include "slap.h"
-#include "back-sql.h"
-#include "sql-wrap.h"
-#include "schema-map.h"
-#include "entry-id.h"
-#include "util.h"
+#include "proto-sql.h"
 
 backsql_entryID *
 backsql_free_entryID( backsql_entryID *id, int freeit )
@@ -239,7 +236,10 @@ backsql_count_children(
                char *end;
 
                *nchildren = strtol( row.cols[ 0 ], &end, 0 );
-               if ( end[ 0 ] != '\0' ) {
+               if ( end[ 0 ] != '\0' && end[0] != '.' ) {
+                       /* FIXME: braindead RDBMSes return
+                        * a fractional number from COUNT!
+                        */
                        res = LDAP_OTHER;
                }
 
@@ -290,13 +290,13 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
  
        Debug( LDAP_DEBUG_TRACE, "==>backsql_get_attr_vals(): "
                "oc='%s' attr='%s' keyval=%ld\n",
-               BACKSQL_OC_NAME( bsi->bsi_oc ), at->ad->ad_cname.bv_val, 
+               BACKSQL_OC_NAME( bsi->bsi_oc ), at->bam_ad->ad_cname.bv_val, 
                bsi->bsi_c_eid->keyval );
 
-       rc = backsql_Prepare( bsi->bsi_dbh, &sth, at->query, 0 );
+       rc = backsql_Prepare( bsi->bsi_dbh, &sth, at->bam_query, 0 );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
-                       "error preparing query: %s\n", at->query, 0, 0 );
+                       "error preparing query: %s\n", at->bam_query, 0, 0 );
                backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc );
                return 1;
        }
@@ -312,7 +312,7 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
        if ( ! BACKSQL_SUCCESS( rc ) ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
                        "error executing attribute query '%s'\n",
-                       at->query, 0, 0 );
+                       at->bam_query, 0, 0 );
                backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc );
                SQLFreeStmt( sth, SQL_DROP );
                return 1;
@@ -356,6 +356,10 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
        SQLFreeStmt( sth, SQL_DROP );
        Debug( LDAP_DEBUG_TRACE, "<==backsql_get_attr_vals()\n", 0, 0, 0 );
 
+       if ( at->bam_next ) {
+               return backsql_get_attr_vals( at->bam_next, v_bsi );
+       }
+
        return 1;
 }
 
@@ -363,7 +367,6 @@ Entry *
 backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
 {
        int                     i;
-       backsql_at_map_rec      *at;
        int                     rc;
        AttributeDescription    *ad_oc = slap_schema.si_ad_objectClass;
 
@@ -387,33 +390,40 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
                        "custom attribute list\n", 0, 0, 0 );
                for ( i = 0; bsi->bsi_attrs[ i ].an_name.bv_val; i++ ) {
-                       AttributeName *attr = &bsi->bsi_attrs[ i ];
+                       backsql_at_map_rec      **vat;
+                       AttributeName           *attr = &bsi->bsi_attrs[ i ];
+                       int                     j;
 
                        if ( attr->an_desc == ad_oc ) {
                                continue;
                        }
 
-                       at = backsql_ad2at( bsi->bsi_oc, attr->an_desc );
-                       if ( at != NULL ) {
-                               backsql_get_attr_vals( at, bsi );
-                       } else {
+                       rc = backsql_supad2at( bsi->bsi_oc, attr->an_desc, &vat );
+                       if ( rc != 0 || vat == NULL ) {
                                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
-                                       "attribute '%s' is not defined "
-                                       "for objectlass '%s'\n",
-                                       attr->an_name.bv_val, 
-                                       BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
+                                               "attribute '%s' is not defined "
+                                               "for objectlass '%s'\n",
+                                               attr->an_name.bv_val, 
+                                               BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
+                               continue;
+                       }
+
+                       for ( j = 0; vat[j]; j++ ) {
+                               backsql_get_attr_vals( vat[j], bsi );
                        }
+
+                       ch_free( vat );
                }
 
        } else {
                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
                        "retrieving all attributes\n", 0, 0, 0 );
-               avl_apply( bsi->bsi_oc->attrs, backsql_get_attr_vals,
+               avl_apply( bsi->bsi_oc->bom_attrs, backsql_get_attr_vals,
                                bsi, 0, AVL_INORDER );
        }
 
        if ( attr_merge_normalize_one( bsi->bsi_e, ad_oc,
-                               &bsi->bsi_oc->oc->soc_cname,
+                               &bsi->bsi_oc->bom_oc->soc_cname,
                                bsi->bsi_op->o_tmpmemctx ) ) {
                entry_free( e );
                return NULL;
@@ -427,7 +437,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
                struct berval   soc;
                int rc;
 
-               bv[ 0 ] = bsi->bsi_oc->oc->soc_cname;
+               bv[ 0 ] = bsi->bsi_oc->bom_oc->soc_cname;
                bv[ 1 ].bv_val = NULL;
 
                rc = structural_class( bv, &soc, NULL,