Changeset 7061 for branches/stable_5.0

Timestamp:

27/10/10 14:52:25 (19 months ago)

Author:

westram

Message:

• backport of [7060]

Location:

branches/stable_5.0

Files:

• AWT/AWT_query_and_functions.cxx (modified) (2 diffs)
• PROBE/PT_io.cxx (modified) (2 diffs)

branches/stable_5.0/AWT/AWT_query_and_functions.cxx

@@ -1155 +1155 @@
                                 bool                  this_hit    = (match_field == AQFT_ALL_FIELDS);
 
-                                char *data = gb_key ? GB_read_as_string(gb_key) : strdup(""); // assume "" for explicit fields that don't exist
-                                awt_assert(data);
+                                char *data       = gb_key ? GB_read_as_string(gb_key) : strdup(""); // assume "" for explicit fields that don't exist
+                                if (!data) error = GB_await_error();
 
                                 while (data) {
@@ -1261 +1261 @@
                     else CLEAR_QUERIED(gb_item, cbs);
 
-                    if (aw_status(searched_count++/double(item_count))) error = "aborted";
+                    if (error) {
+                        error = GB_failedTo_error("query", GBT_get_name(gb_item), error);
+                    }
+                    else {
+                        if (aw_status(searched_count++/double(item_count))) error = "aborted";
+                    }
                 }
             }

branches/stable_5.0/PROBE/PT_io.cxx

@@ -176 +176 @@
 
 static char *probe_read_string_append_point(GBDATA *gb_data, int *psize) {
-    long len = GB_read_string_count(gb_data);
+    long  len  = GB_read_string_count(gb_data);
     char *data = GB_read_string(gb_data);
 
-    if (data[len - 1] != '.') {
-        char *buffer = (char *) malloc(len + 2);
-        strcpy(buffer, data);
-        buffer[len++] = '.';
-        buffer[len] = 0;
-        freeset(data, buffer);
-    }
-    *psize = len;
+    if (data) {
+        if (data[len - 1] != '.') {
+            char *buffer = (char *) malloc(len + 2);
+            strcpy(buffer, data);
+            buffer[len++] = '.';
+            buffer[len] = 0;
+            freeset(data, buffer);
+        }
+        *psize = len;
+    }
+    else {
+        *psize = 0;
+    }
     return data;
 }
@@ -255 +260 @@
             }
             else {
-                {
-                    int   hsize;
-                    char *data = probe_read_string_append_point(gb_data, &hsize);
+                int   hsize;
+                char *data = probe_read_string_append_point(gb_data, &hsize);
+
+                if (!data) {
+                    GB_ERROR error = GB_await_error();
+                    fprintf(stderr, "Could not read data in '%s' for species '%s'\n(Reason: %s)\n",
+                            psg.alignment_name, pid.name, error);
+                    data_missing++;
+                }
+                else {
                     pid.checksum = GB_checksum(data, hsize, 1, ".-");
-                    int   size = probe_compress_sequence(data, hsize);
+                    int size     = probe_compress_sequence(data, hsize);
 
                     pid.data = (char *)gbs_malloc_copy(data, size);
                     pid.size = size;
                     
-                    free(data);
+                    count ++;
+                    if (count%10 == 0) {
+                        if (count%500) fputc('.', stdout);
+                        else printf(".%6i (%5.1f%%)\n", count, ((double)count/species_count)*100);
+                        fflush(stdout);
+                    }
                 }
-
-                count ++;
-                if (count%10 == 0) {
-                    if (count%500) fputc('.', stdout);
-                    else printf(".%6i (%5.1f%%)\n", count, ((double)count/species_count)*100);
-                    fflush(stdout);
-                }
+                free(data);
             }
         }