-rw-r--r-- | src/Makefile.am | 11 | ||||
-rw-r--r-- | src/aggregator.c | 7 | ||||
-rw-r--r-- | src/updator.c | 33 |
3 files changed, 43 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fcbcdd5..a7e6852 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -1,15 +1,18 @@ | |||
1 | bin_PROGRAMS = aggregator | 1 | bin_PROGRAMS = aggregator updator |
2 | 2 | ||
3 | aggregator_SOURCES = \ | 3 | aggregator_SOURCES = \ |
4 | aggregator.c \ | 4 | aggregator.c \ |
5 | assign_protein_type.c \ | ||
6 | check_error.c \ | 5 | check_error.c \ |
7 | check_h5_error.c \ | 6 | check_h5_error.c \ |
8 | check_ncbi_error.c \ | ||
9 | load_influenza_aa_dat.c \ | 7 | load_influenza_aa_dat.c \ |
10 | load_influenza_faa.c | 8 | load_influenza_faa.c |
11 | 9 | ||
12 | aggregator_LDADD = -lhdf5 | 10 | updator_SOURCES = \ |
11 | updator.c \ | ||
12 | check_error.c \ | ||
13 | check_h5_error.c \ | ||
14 | check_ncbi_error.c \ | ||
15 | assign_protein_type.c | ||
13 | 16 | ||
14 | noinst_HEADERS = \ | 17 | noinst_HEADERS = \ |
15 | assign_protein_type.h \ | 18 | assign_protein_type.h \ |
diff --git a/src/aggregator.c b/src/aggregator.c index 36ea18c..07aba39 100644 --- a/src/aggregator.c +++ b/src/aggregator.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * container. | 3 | * container. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "assign_protein_type.h" | ||
7 | #include "check_h5_error.h" | 6 | #include "check_h5_error.h" |
8 | #include "load_influenza_aa_dat.h" | 7 | #include "load_influenza_aa_dat.h" |
9 | #include "load_influenza_faa.h" | 8 | #include "load_influenza_faa.h" |
@@ -17,6 +16,8 @@ main () | |||
17 | * Create the HDF5 file. | 16 | * Create the HDF5 file. |
18 | */ | 17 | */ |
19 | hid_t file_id = H5Fcreate (FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); | 18 | hid_t file_id = H5Fcreate (FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); |
19 | if (file_id < 0) | ||
20 | check_h5_error (file_id, __FILE__, __LINE__); | ||
20 | 21 | ||
21 | /* | 22 | /* |
22 | * Load the supplementary protein data file. | 23 | * Load the supplementary protein data file. |
@@ -29,13 +30,11 @@ main () | |||
29 | load_influenza_faa (file_id); | 30 | load_influenza_faa (file_id); |
30 | 31 | ||
31 | /* | 32 | /* |
32 | * Close the HD5 file. | 33 | * Close the HDF5 file. |
33 | */ | 34 | */ |
34 | herr_t status = H5Fclose (file_id); | 35 | herr_t status = H5Fclose (file_id); |
35 | if (status < 0) | 36 | if (status < 0) |
36 | check_h5_error (status, __FILE__, __LINE__); | 37 | check_h5_error (status, __FILE__, __LINE__); |
37 | 38 | ||
38 | // assign_protein_type (0); | ||
39 | |||
40 | return 0; | 39 | return 0; |
41 | } | 40 | } |
diff --git a/src/updator.c b/src/updator.c new file mode 100644 index 0000000..8d556da --- a/dev/null +++ b/src/updator.c | |||
@@ -0,0 +1,33 @@ | |||
1 | /* | ||
2 | * Update derived fields. | ||
3 | */ | ||
4 | |||
5 | #include "assign_protein_type.h" | ||
6 | #include "check_h5_error.h" | ||
7 | |||
8 | #define FILE "influenza.h5" | ||
9 | |||
10 | int | ||
11 | main () | ||
12 | { | ||
13 | /* | ||
14 | * Open the HDF5 file. | ||
15 | */ | ||
16 | hid_t file_id = H5Fopen (FILE, H5F_ACC_RDWR, H5P_DEFAULT); | ||
17 | if (file_id < 0) | ||
18 | check_h5_error (file_id, __FILE__, __LINE__); | ||
19 | |||
20 | /* | ||
21 | * Assign protein type values to the sequence records. | ||
22 | */ | ||
23 | assign_protein_type (file_id); | ||
24 | |||
25 | /* | ||
26 | * Close the HDF5 file. | ||
27 | */ | ||
28 | herr_t status = H5Fclose (file_id); | ||
29 | if (status < 0) | ||
30 | check_h5_error (status, __FILE__, __LINE__); | ||
31 | |||
32 | return 0; | ||
33 | } | ||