Changeset 6811

Timestamp:

09/09/10 13:03:26 (17 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

Location:

trunk

Files:

• ARBDB/ad_config.cxx (modified) (1 diff)
• ARBDB/ad_t_prot.h (modified) (1 diff)
• ARBDB/adname.cxx (modified) (4 diffs)
• SL/AW_NAME/AW_rename.cxx (modified) (1 diff)

trunk/ARBDB/ad_config.cxx

@@ -195 +195 @@
         }
 
-        switch (item->type) {
-            case CI_CLOSE_GROUP:
-                pos += 2;
-                break;
-
-            case CI_UNKNOWN:
-                error = GBS_global_string_copy("Unknown flag '%c'", label);
-                break;
-
-            default: {
-                const char *start_of_name = str+pos+2;
-                const char *behind_name   = strchr(start_of_name, '\1');
-
-                if (!behind_name) behind_name = strchr(start_of_name, '\0'); // eos
-                gb_assert(behind_name);
-
-                item->name = (char*)GB_calloc(1, behind_name-start_of_name+1);
-                memcpy(item->name, start_of_name, behind_name-start_of_name);
-                pos       = behind_name-str;
-                break;
+        if (item->type == CI_CLOSE_GROUP) {
+            pos += 2;
+        }
+        else {
+            const char *start_of_name = str+pos+2;
+            const char *behind_name   = strchr(start_of_name, '\1');
+
+            if (!behind_name) behind_name = strchr(start_of_name, '\0'); // eos
+            gb_assert(behind_name);
+
+            char *data = GB_strpartdup(start_of_name, behind_name-1);
+            if (item->type == CI_UNKNOWN) {
+                error = GBS_global_string_copy("Unknown flag '%c' (followed by '%s')", label, data);
+                free(data);
+            }
+            else {
+                item->name = data;
+                pos        = behind_name-str;
             }
         }

trunk/ARBDB/ad_t_prot.h

@@ -79 +79 @@
 GB_ERROR GBT_rename_species(const char *oldname, const char *newname, bool ignore_protection);
 GB_ERROR GBT_abort_rename_session(void);
-GB_ERROR GBT_commit_rename_session(int (*show_status)(double gauge), int (*show_status_text)(const char *));
+GB_ERROR GBT_commit_rename_session(int (*show_status)(double gauge), int (*show_status_text)(const char *)) __ATTR__USERESULT;
 
 /* adseqcompr.cxx */

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;
 }

trunk/SL/AW_NAME/AW_rename.cxx

@@ -538 +538 @@
             }
             else {
-                GBT_commit_rename_session(aw_status, aw_status);
+                err = GBT_commit_rename_session(aw_status, aw_status);
             }