Changeset 8363

Timestamp:

04/02/12 16:28:09 (4 months ago)

Author:

westram

Message:

• property file loading
  • missing fallback for 'Save loaded Properties' when no saved properties existed yet
  • GB_login now always prints full-path of loaded properties to console

Location:

trunk

Files:

• ARBDB/ad_load.cxx (modified) (3 diffs)
• EDIT4/ED4_main.cxx (modified) (1 diff)
• EDIT4/ED4_root.cxx (modified) (2 diffs)

trunk/ARBDB/ad_load.cxx

@@ -1358 +1358 @@
      * - 's'     read only ???
      * - 'D' looks for default in $ARBHOME/lib/arb_default if file is not found in ~/.arb_prop
-     *       (only work combined with mode 'c') 
+     *       (only works combined with mode 'c') 
      * - memory usage:
      *   - 't' small memory usage
@@ -1516 +1516 @@
                         }
                         else {
-                            fprintf(stderr, "Using properties from '%s'\n", found_path);
                             freeset(path, found_path);
                             input = fopen(path, "rb");
@@ -1533 +1532 @@
             }
             if (input) {
+                if (strchr(opent, 'D')) { // we are loading properties -> be verboose
+                    fprintf(stderr, "Using properties from '%s'\n", path);
+                }
                 time_of_main_file = GB_time_of_file(path);
 

trunk/EDIT4/ED4_main.cxx

@@ -460 +460 @@
     e4_assert(mode >= 0 && mode <= 2);
 
-    if (mode == 2) return "edit4.arb";
-
-    static char *ali_name = 0;
-    static char *ali_type = 0;
-    static char *result = 0;
-
-    if (!ali_name) {
-        GB_transaction dummy(GLOBAL_gb_main);
-        ali_name = GBT_get_default_alignment(GLOBAL_gb_main);
-        ali_type = GBT_get_alignment_type_string(GLOBAL_gb_main, ali_name);
-        result   = new char[21+strlen(ali_name)];
-    }
-
-    sprintf(result, "edit4_%s.arb", mode == 0 ? ali_name : ali_type);
+    const char *result;
+    if (mode == 2) {
+        result = "edit4.arb";
+    }
+    else {
+        static char *ali_name = 0;
+        static char *ali_type = 0;
+        static char *result_copy = 0;
+
+        if (!ali_name) {
+            GB_transaction dummy(GLOBAL_gb_main);
+            ali_name = GBT_get_default_alignment(GLOBAL_gb_main);
+            ali_type = GBT_get_alignment_type_string(GLOBAL_gb_main, ali_name);
+            result_copy   = new char[21+strlen(ali_name)];
+        }
+
+        sprintf(result_copy, "edit4_%s.arb", mode == 0 ? ali_name : ali_type);
+        result = result_copy;
+    }
 
     return result;

trunk/EDIT4/ED4_root.cxx

@@ -1560 +1560 @@
             }
         }
-        e4_assert(default_mode != -1);
+        if (default_mode == -1) default_mode = 2; // no properties yet -> use 'edit4.arb'
 
         const char *entry = GBS_global_string("Save loaded Properties (%s)", ED4_propertyName(default_mode));
@@ -1873 +1873 @@
     // if not, use 'mode 2', i.e. "edit4.arb"
     // (no full path, we want to load default from arb_defaults)
-    if (!propname) {
-        freedup(propname, ED4_propertyName(2));
-    }
-
-    GB_informationf("Using properties from '%s'", propname);
+    if (!propname) propname = strdup(ED4_propertyName(2));
+
     return propname;
 }