diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/im-sandbox.c | 9 | ||||
| -rw-r--r-- | src/indexamajig.c | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c index 3d9f1f96..2fa19820 100644 --- a/src/im-sandbox.c +++ b/src/im-sandbox.c @@ -343,7 +343,6 @@ static int run_work(const struct index_args *iargs, Stream *st, struct im_asapo *asapostuff = NULL; Mille *mille; ImageDataArrays *ida; - int asapo_message_id; if ( sb->profile ) { profile_init(); @@ -491,6 +490,7 @@ static int run_work(const struct index_args *iargs, Stream *st, char *filename; char *event; int finished = 0; + int asapo_message_id; profile_start("asapo-fetch"); set_last_task(sb->shared->last_task[cookie], "ASAPO fetch"); @@ -533,10 +533,11 @@ static int run_work(const struct index_args *iargs, Stream *st, sb->shared, sb->shared->last_task[cookie], asapostuff, mille, ida); profile_end("process-image"); - } - if ( sb->asapo_params != NULL ) { - im_asapo_finalise(asapostuff, asapo_message_id); + if ( sb->asapo_params != NULL ) { + im_asapo_finalise(asapostuff, ser); + } + } /* NB pargs.zmq_data, pargs.asapo_data and pargs.asapo_meta diff --git a/src/indexamajig.c b/src/indexamajig.c index aa0db210..9416d234 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -1241,7 +1241,10 @@ int main(int argc, char *argv[]) return 1; } - if ( (args.filename != NULL) && is_hdf5_file(args.filename, &err) ) { + if ( (args.filename != NULL) + && (strcmp(args.filename, "-") != 0) + && is_hdf5_file(args.filename, &err) ) + { ERROR("Your input file appears to be an HDF5 file.\n"); ERROR("The input file should be a list of data files, not the " "data file itself.\n"); |