a74c645505a135d5c1e923afe477cdeb9c15bded markd Wed Jul 8 22:27:42 2020 -0700 added including multiple container directoies in genome dir path to gfServer diff --git src/jkOwnLib/genoFind.c src/jkOwnLib/genoFind.c index a2e40d1..005320c 100644 --- src/jkOwnLib/genoFind.c +++ src/jkOwnLib/genoFind.c @@ -958,47 +958,47 @@ /* Warn if they exceed 4 gig. */ if (totalBases >= warnAt) errAbort("Exceeding 4 billion bases, sorry gfServer can't handle that."); } gfAllocLists(gf); gfZeroNonOverused(gf); AllocArray(gf->sources, totalSeq); gf->sourceCount = totalSeq; ss = gf->sources; for (i=0; i<fileCount; ++i) { fileName = fileNames[i]; if (nibIsFile(fileName)) { nibSize = gfAddTilesInNib(gf, fileName, offset, stepSize); - ss->fileName = fileName; + ss->fileName = cloneString(findTail(fileName, '/')); ss->start = offset; offset += nibSize; ss->end = offset; ++ss; } else { struct twoBitFile *tbf = twoBitOpen(fileName); struct twoBitIndex *index; char nameBuf[PATH_LEN+256]; for (index = tbf->indexList; index != NULL; index = index->next) { struct dnaSeq *seq = twoBitReadSeqFragLower(tbf, index->name, 0,0); gfAddSeq(gf, seq, offset); safef(nameBuf, sizeof(nameBuf), "%s:%s", fileName, index->name); - ss->fileName = cloneString(nameBuf); + ss->fileName = cloneString(findTail(nameBuf, '/')); ss->start = offset; offset += seq->size; ss->end = offset; ++ss; dnaSeqFree(&seq); } twoBitClose(&tbf); } } gf->totalSeqSize = offset; gfZeroOverused(gf); printf("Done adding\n"); return gf; }