Changeset 6353 for trunk/EDIT4/EDB_root_bact.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/EDB_root_bact.cxx (modified) (3 diffs)

trunk/EDIT4/EDB_root_bact.cxx

@@ -71 +71 @@
     }
 
-
     if (!gb_datamode) { // didn't find this species
         char dummy[150];
-        all_found++;
-        sprintf(dummy,"%ld. %s\n",all_found, str);
-        GBS_strcat(not_found_message,dummy);
+        not_found_counter++;
+        if (not_found_counter <= MAX_SHOWN_MISSING_SPECIES) {
+            sprintf(dummy,"%ld. %s\n", not_found_counter, str);
+            GBS_strcat(not_found_message,dummy);
+        }
         return ED4_R_BREAK;
     }
 
-    // check whether sequence has data in desired alignment
+        // check whether sequence has data in desired alignment
     bool has_alignment = 0 != GB_entry(gb_datamode,ED4_ROOT->alignment_name);
     if (!has_alignment) {
         if (datamode == ED4_D_SPECIES) { // only warn about species w/o data (SAIs are skipped silently)
             char dummy[150];
-            all_found++;
-            sprintf(dummy,"%ld. %s (no data in alignment)\n",all_found, str);
-            GBS_strcat(not_found_message,dummy);
+            not_found_counter++;
+            if (not_found_counter <= MAX_SHOWN_MISSING_SPECIES) {
+                sprintf(dummy,"%ld. %s (no data in alignment)\n", not_found_counter, str);
+                GBS_strcat(not_found_message,dummy);
+            }
         }
         return ED4_R_BREAK;
@@ -134 +137 @@
     local_count_position += max(name_coords, seq_coords);
     name_coords = seq_coords = 0;
-    species_read ++;
 
     if (!(multi_species_manager->flag.hidden)) {
@@ -577 +579 @@
     sequence_terminal->parent->resize_requested_by_child();
 
-    species_read ++;
     (*y) += height_terminal + height_spacer;