639dd732054dbcb5a2ec51de9a032d23dac08305 braney Fri Jan 15 13:12:31 2016 -0800 a little more tweaking of CRAM support diff --git src/lib/bamFile.c src/lib/bamFile.c index 9ba386b..3c4dbc0 100644 --- src/lib/bamFile.c +++ src/lib/bamFile.c @@ -224,33 +224,34 @@ // we know there was an error finding the reference and we need // to request that it be loaded. if (samfile->format.format == cram) { char *md5String = cram_get_Md5(samfile); if (!isEmpty(md5String)) { char server[4096]; char pendingFile[4096]; char errorFile[4096]; char *refPath = cram_get_ref_url(samfile); char *cacheDir = cram_get_cache_dir(samfile); sprintf(server, refPath, md5String); - sprintf(pendingFile, "%s/pending/%s",cacheDir,md5String); + sprintf(pendingFile, "%s/pending/",cacheDir); sprintf(errorFile, "%s/error/%s",cacheDir,md5String); makeDirsOnPath(pendingFile); + sprintf(pendingFile, "%s/pending/%s",cacheDir,md5String); FILE *downFile; if ((downFile = fopen(errorFile, "r")) != NULL) { char errorBuf[4096]; mustGetLine(downFile, errorBuf, sizeof errorBuf); errAbort("cannot find reference %s. Error: %s\n", md5String,errorBuf); } else { if ((downFile = fopen(pendingFile, "w")) == NULL) errAbort("cannot find reference %s. Cannot create file %s.",md5String, pendingFile); fprintf(downFile, "%s\n", server); fclose(downFile); errAbort("cannot find reference %s. Downloading from %s. Pending in %s",md5String, server, pendingFile); }