-rw-r--r-- | src/aggregator.c | 3 | ||||
-rw-r--r-- | src/assign/assign_protein_type.c | 110 | ||||
-rw-r--r-- | src/load/load_influenza_aa_dat.c | 13 | ||||
-rw-r--r-- | src/load/load_influenza_aa_dat.h | 2 | ||||
-rw-r--r-- | src/load/load_influenza_faa.c | 30 | ||||
-rw-r--r-- | src/load/load_influenza_faa.h | 2 | ||||
-rw-r--r-- | src/model/gi_type_data_init.c | 4 | ||||
-rw-r--r-- | src/model/gi_type_data_init.h | 4 | ||||
-rw-r--r-- | src/model/sequence_data_init.c | 18 | ||||
-rw-r--r-- | src/model/sequence_data_init.h | 6 |
10 files changed, 99 insertions, 93 deletions
diff --git a/src/load/load_influenza_aa_dat.c b/src/load/load_influenza_aa_dat.c index 3826349..b50fcab 100644 --- a/src/load/load_influenza_aa_dat.c +++ b/src/load/load_influenza_aa_dat.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #define NFIELDS (hsize_t) 11 | 15 | #define NFIELDS (hsize_t) 11 |
16 | 16 | ||
17 | void | 17 | void |
18 | load_influenza_aa_dat (hid_t file_id, const char* file_name) | 18 | load_influenza_aa_dat (hid_t file_id, const char *file_name) |
19 | { | 19 | { |
20 | /* | 20 | /* |
21 | * Model the data using native types. | 21 | * Model the data using native types. |
@@ -225,7 +225,8 @@ load_influenza_aa_dat (hid_t file_id, const char* file_name) | |||
225 | if (status < 0) | 225 | if (status < 0) |
226 | check_h5_error (status, __FILE__, __LINE__); | 226 | check_h5_error (status, __FILE__, __LINE__); |
227 | 227 | ||
228 | status = H5TBdelete_record (file_id, "influenza_aa.dat", 0, nrecords); | 228 | status = |
229 | H5TBdelete_record (file_id, "influenza_aa.dat", 0, nrecords); | ||
229 | if (status < 0) | 230 | if (status < 0) |
230 | check_h5_error (status, __FILE__, __LINE__); | 231 | check_h5_error (status, __FILE__, __LINE__); |
231 | 232 | ||
@@ -233,7 +234,7 @@ load_influenza_aa_dat (hid_t file_id, const char* file_name) | |||
233 | H5TBappend_records (file_id, "influenza_aa.dat", 1, dst_size, | 234 | H5TBappend_records (file_id, "influenza_aa.dat", 1, dst_size, |
234 | dst_offset, dst_sizes, &p_data); | 235 | dst_offset, dst_sizes, &p_data); |
235 | if (status < 0) | 236 | if (status < 0) |
236 | check_h5_error (status, __FILE__, __LINE__); | 237 | check_h5_error (status, __FILE__, __LINE__); |
237 | } | 238 | } |
238 | 239 | ||
239 | /* | 240 | /* |
@@ -242,8 +243,10 @@ load_influenza_aa_dat (hid_t file_id, const char* file_name) | |||
242 | else | 243 | else |
243 | { | 244 | { |
244 | herr_t status = H5TBmake_table ("influenza_aa.dat", file_id, | 245 | herr_t status = H5TBmake_table ("influenza_aa.dat", file_id, |
245 | "influenza_aa.dat", NFIELDS, 1, dst_size, | 246 | "influenza_aa.dat", NFIELDS, 1, |
246 | field_names, dst_offset, field_type, | 247 | dst_size, |
248 | field_names, dst_offset, | ||
249 | field_type, | ||
247 | chunk_size, fill_data, compress, | 250 | chunk_size, fill_data, compress, |
248 | &p_data); | 251 | &p_data); |
249 | if (status < 0) | 252 | if (status < 0) |