Changeset 6811 for trunk/ARBDB/adname.cxx

Timestamp:

09/09/10 13:03:26 (21 months ago)

Author:

westram

Message:

• report more information about broken configurations
• GBT_commit_rename_session did NEVER report error (since [2])
  • added __ATTR__USERESULT
• forward error in AWTC_pars_names (and abort complete rename)
• this fixes the bug with noticable broken configs after merge/rename
  • cause of bug: the config parser used inside ABRDB is much more picky than the one used in NTREE (needs to be DRYed)
  • no idea when this bug was introduced (maybe by introduction of GBT_config_parser in [3824]) and why it popped up now

Files:

• trunk/ARBDB/adname.cxx (modified) (4 diffs)

trunk/ARBDB/adname.cxx

@@ -159 +159 @@
 
 GB_ERROR GBT_commit_rename_session(int (*show_status)(double gauge), int (*show_status_text)(const char *)) {
+    // goes to header: __ATTR__USERESULT
     GB_ERROR error = 0;
 
@@ -228 +229 @@
 
                         if (!error) freeset(*configStrPtr, GBS_strclose(strstruct));
+                        else {
+                            error = GBS_global_string("Failed to parse configuration '%s' (Reason: %s)", config_names[count], error);
+                        }
 
                         GBT_free_config_item(item);
@@ -233 +237 @@
                     }
 
-                    if (!error && need_save) error = GBT_save_configuration_data(config, NameSession.gb_main, config_names[count]);
+                    if (!error && need_save) {
+                        error = GBT_save_configuration_data(config, NameSession.gb_main, config_names[count]);
+                    }
                 }
                 if (show_status) show_status((double)(count+1)/config_count);
@@ -262 +268 @@
     gbt_free_rename_session_data();
 
-    error = GB_pop_transaction(NameSession.gb_main);
+    error = GB_end_transaction(NameSession.gb_main, error);
     return error;
 }