Changeset 6269 for branches/clusters/SL/FAST_ALIGNER/fast_aligner.cxx

Timestamp:

23/11/09 08:54:41 (3 years ago)

Author:

westram

Message:

• merged 6262-6267

Files:

• branches/clusters/SL/FAST_ALIGNER/fast_aligner.cxx (modified) (8 diffs)

branches/clusters/SL/FAST_ALIGNER/fast_aligner.cxx

@@ -132 +132 @@
 // --------------------------------------------------------------------------------
 
-static inline GB_ERROR species_not_found(GB_CSTR species_name) {
-    return GB_export_errorf("No species '%s' found!", species_name);
-}
-
-static GB_ERROR reverseComplement(GBDATA *gb_species, GB_CSTR ali, int max_protection) {
+ATTRIBUTED(__ATTR__USERESULT, 
+           static inline GB_ERROR species_not_found(GB_CSTR species_name))
+{
+    return GBS_global_string("No species '%s' found!", species_name);
+}
+
+ATTRIBUTED(__ATTR__USERESULT, 
+           static GB_ERROR reverseComplement(GBDATA *gb_species, GB_CSTR ali, int max_protection))
+{
     GBDATA *gbd = GBT_read_sequence(gb_species, ali);
     GB_ERROR error = 0;
 
     if (!gbd) {
-        error = GB_export_errorf("No 'data' found for species '%s'", GBT_read_name(gb_species));
+        error = GBS_global_string("No 'data' found for species '%s'", GBT_read_name(gb_species));
     }
     else {
@@ -159 +163 @@
         }
         else { // protection error
-            error = GB_export_errorf("Cannot reverse-complement species '%s' because of protection level", GBT_read_name(gb_species));
+            error = GBS_global_string("Cannot reverse-complement species '%s' because of protection level", GBT_read_name(gb_species));
         }
 
@@ -1129 +1133 @@
     }
     else {
-        error = GB_export_errorf("No 'data' found for species '%s'", GBT_read_name(gb_species));
+        error = GBS_global_string("No 'data' found for species '%s'", GBT_read_name(gb_species));
         if (dataPtr) *dataPtr = NULL; // (user must not care to free data if we fail)
     }
@@ -1139 +1143 @@
 }
 
-static GB_ERROR writeStringToAlignment(GBDATA *gb_species, GB_CSTR alignment, GB_CSTR data_name, GB_CSTR str, bool temporary) {
+ATTRIBUTED(__ATTR__USERESULT, 
+           static GB_ERROR writeStringToAlignment(GBDATA *gb_species, GB_CSTR alignment, GB_CSTR data_name, GB_CSTR str, bool temporary))
+{
     GBDATA   *gb_ali  = GB_search(gb_species, alignment, GB_DB);
     GB_ERROR  error   = NULL;
@@ -1150 +1156 @@
     }
     else {
-        error = GB_export_errorf("Cannot create entry '%s' for '%s'", data_name, GBT_read_name(gb_species));
+        error = GBS_global_string("Cannot create entry '%s' for '%s'", data_name, GBT_read_name(gb_species));
     }
 
@@ -1498 +1504 @@
             GBDATA *gbd = GBT_read_sequence(gb_toAlign, relSearch.pt_server_alignment); // use a different alignment for next relative search
             if (!gbd) {
-                error = GB_export_errorf("Species '%s' has no data in alignment '%s'", GBT_read_name(gb_toAlign), relSearch.pt_server_alignment);
+                error = GBS_global_string("Species '%s' has no data in alignment '%s'", GBT_read_name(gb_toAlign), relSearch.pt_server_alignment);
             }
             else {
@@ -2207 +2213 @@
 
     if (wasNotAllowedToAlign>0) {
-        const char *mess = GB_export_errorf("%i species were not aligned (because of protection level)", wasNotAllowedToAlign);
+        const char *mess = GBS_global_string("%i species were not aligned (because of protection level)", wasNotAllowedToAlign);
         aw_popup_ok(mess);
     }
@@ -2213 +2219 @@
     if (err_count) {
         if (error) aw_message(error);
-        error = GB_export_errorf("Aligner produced %i error%c", err_count, err_count==1 ? '\0' : 's');
+        error = GBS_global_string("Aligner produced %i error%c", err_count, err_count==1 ? '\0' : 's');
     }