826153d8a963a91ca519e2dcac0c20e4793dc3e1 braney Mon Nov 28 12:49:38 2016 -0800 change trash directory for blat bigPsl to "hgBlat" diff --git src/hg/hgBlat/hgBlat.c src/hg/hgBlat/hgBlat.c index ff85069..ea8c389 100644 --- src/hg/hgBlat/hgBlat.c +++ src/hg/hgBlat/hgBlat.c @@ -255,31 +255,31 @@ pslName, faName, uiState, unhideTrack); /* htmlStart("Redirecting"); */ /* Odd it appears that we've already printed the Content-Typ:text/html line but I can't figure out where... */ htmStart(stdout, "Redirecting"); printf("", url); printf("", url); htmlEnd(); } static void makeBigPsl(char *pslName, char *faName, char *db, char *outputBigBed) /* Make a bigPsl with the blat results. */ { struct tempName bigPslTn; -trashDirFile(&bigPslTn, "bigPsl", "bp", ".bigPsl"); +trashDirFile(&bigPslTn, "hgBlat", "bp", ".bigPsl"); char cmdBuffer[4096]; safef(cmdBuffer, sizeof(cmdBuffer), "loader/pslToBigPsl %s -fa=%s stdout | sort -k1,1 -k2,2n > %s", pslName, faName, bigPslTn.forCgi); system(cmdBuffer); safef(cmdBuffer, sizeof(cmdBuffer), "loader/bedToBigBed -extraIndex=name -tab -as=loader/bigPsl.as -type=bed12+13 %s http://hgdownload.cse.ucsc.edu/goldenPath/%s/bigZips/%s.chrom.sizes %s", bigPslTn.forCgi, db, db, outputBigBed); system(cmdBuffer); unlink(bigPslTn.forCgi); } void showAliPlaces(char *pslName, char *faName, char *customText, char *database, enum gfType qType, enum gfType tType, char *organism, boolean feelingLucky) /* Show all the places that align. */ { @@ -736,34 +736,34 @@ else { gfAlignStrand(&conn, serve->nibDir, seq, FALSE, minMatchShown, tFileCache, gvo); reverseComplement(seq->dna, seq->size); conn = gfConnect(serve->host, serve->port); gfAlignStrand(&conn, serve->nibDir, seq, TRUE, minMatchShown, tFileCache, gvo); } gfOutputQuery(gvo, f); } carefulClose(&f); if (useBigPsl) { // make bigPsl struct tempName bigBedTn; - trashDirFile(&bigBedTn, "bigPsl", "bp", ".bb"); + trashDirFile(&bigBedTn, "hgBlat", "bp", ".bb"); makeBigPsl(pslTn.forCgi, faTn.forCgi, serve->db, bigBedTn.forCgi); struct tempName customTextTn; - trashDirFile(&customTextTn, "bigPsl", "ct", ".txt"); + trashDirFile(&customTextTn, "hgBlat", "ct", ".txt"); FILE *fp = fopen(customTextTn.forCgi, "w"); char* host = getenv("HTTP_HOST"); char* reqUrl = getenv("REQUEST_URI"); // remove everything after / in URL char *e = strrchr(reqUrl, '/'); if (e) *e = 0; char *trackName = getUnusedName(database, cart); char *customTextTemplate = "track type=bigPsl visibility=pack showAll=on htmlUrl=http://%s/goldenPath/help/hgUserPsl.html %s bigDataUrl=http://%s/%s/%s name=\"%s\"\n"; char *extraForMismatch = "showDiffBasesAllScales=. baseColorUseSequence=lfExtra baseColorDefault=diffBases"; if (qIsProt) extraForMismatch = ""; fprintf(fp, customTextTemplate, host, extraForMismatch, host, reqUrl, bigBedTn.forCgi, trackName); fclose(fp);