Changeset 6353 for trunk/EDIT4/ED4_cursor.cxx

Timestamp:

14/01/10 15:10:39 (2 years ago)

Author:

westram

Message:

• removed useless variable 'species_read'
• fixed overflow if too many missing species in configuration
  • shortened error message (show only first 200 missing species)
• moved some duplicated code into ED4_init_notFoundMessage / ED4_finish_and_show_notFoundMessage

Files:

• trunk/EDIT4/ED4_cursor.cxx (modified) (5 diffs)

trunk/EDIT4/ED4_cursor.cxx

@@ -592 +592 @@
 }
 
+void ED4_init_notFoundMessage() {
+    not_found_counter = 0;
+    not_found_message = GBS_stropen(10000);
+    // GBS_strcat(not_found_message,"Species not found: ");
+}
+void ED4_finish_and_show_notFoundMessage() {
+    if (not_found_counter != 0) {
+        GBS_strcat(not_found_message, GBS_global_string("(skipped display of %i more species)\n", not_found_counter-MAX_SHOWN_MISSING_SPECIES));
+        char *out_message = GBS_strclose(not_found_message);
+        aw_message(out_message);
+        aw_message(GBS_global_string("Couldn't load %i species:", not_found_counter));
+        free(out_message);
+    }
+    else {
+        GBS_strforget(not_found_message);
+    }
+    not_found_message = 0;
+}
+
 void ED4_get_and_jump_to_species(GB_CSTR species_name)
 {
@@ -608 +627 @@
         ED4_index                  lot                 = 0;
 
-        all_found         = 0;
-        not_found_message = GBS_stropen(1000);
-        GBS_strcat(not_found_message,"Species not found: ");
+        ED4_init_notFoundMessage();
 
         sprintf(string, "-L%s", species_name);
@@ -618 +635 @@
         loaded = 1;
 
-        {
-            char *out_message = GBS_strclose(not_found_message);
-            not_found_message = 0;
-            if (all_found != 0) aw_message(out_message);
-            free(out_message);
-        }
+        ED4_finish_and_show_notFoundMessage();
 
         {
@@ -698 +710 @@
         aw_status("Loading species...");
 
-        all_found         = 0;
-        not_found_message = GBS_stropen(1000);
-        GBS_strcat(not_found_message,"Species not found: ");
+        ED4_init_notFoundMessage();
 
         while (gb_species) {
@@ -754 +764 @@
         aw_message(GBS_global_string("Loaded %i of %i marked species.", inserted, marked));
 
-        {
-            char *out_message = GBS_strclose(not_found_message);
-            not_found_message = 0;
-            if (all_found != 0) aw_message(out_message);
-            free(out_message);
-        }
-
+        ED4_finish_and_show_notFoundMessage();
+        
         if (inserted) {
             /* new AAseqTerminals should be created if it is in ProtView mode */