9b2bccae0dced3d04c3edb7a263437407586e1ff braney Tue Dec 13 11:28:53 2016 -0800 more changes for Hiram diff --git src/hg/hgBlat/hgBlat.c src/hg/hgBlat/hgBlat.c index 3605652..6ce2716 100644 --- src/hg/hgBlat/hgBlat.c +++ src/hg/hgBlat/hgBlat.c @@ -621,40 +621,40 @@ trashDirDateFile(&bigBedTn, "hgBlat", "bp", ".bb"); char *bigBedFile = bigBedTn.forCgi; makeBigPsl(pslFilename, faFilename, db, bigBedFile); char *customTextFile = replaceSuffix(bigBedFile, "txt"); FILE *fp = fopen(customTextFile, "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 = NULL; char *trackDescription = NULL; getCustomName(db, cart, pslList, &trackName, &trackDescription); -char *customTextTemplate = "track type=bigPsl pslFile_%s=%s visibility=pack showAll=on htmlUrl=http://%s/goldenPath/help/hgUserPsl.html %s bigDataUrl=http://%s%s/%s name=\"%s\" description=\"%s\"\n"; +char *customTextTemplate = "track type=bigPsl pslFile=%s visibility=pack showAll=on htmlUrl=http://%s/goldenPath/help/hgUserPsl.html %s bigDataUrl=http://%s%s/%s name=\"%s\" description=\"%s\"\n"; char *extraForMismatch = "showDiffBasesAllScales=. baseColorUseSequence=lfExtra baseColorDefault=diffBases"; if (isProt) extraForMismatch = ""; -fprintf(fp, customTextTemplate, db, bigBedTn.forCgi, host, extraForMismatch, host, reqUrl, bigBedTn.forCgi, trackName, trackDescription); +fprintf(fp, customTextTemplate, bigBedTn.forCgi, host, extraForMismatch, host, reqUrl, bigBedTn.forCgi, trackName, trackDescription); fclose(fp); char buffer[4096]; -safef(buffer, sizeof buffer, "http://%s/%s/%s", host, reqUrl, customTextFile); +safef(buffer, sizeof buffer, "http://%s%s/%s", host, reqUrl, customTextFile); return cloneString(buffer); } void blatSeq(char *userSeq, char *organism, char *database) /* Blat sequence user pasted in. */ { boolean doHyper = sameString(cartUsualString(cart, "output", outputList[0]), "hyperlink");; boolean useBigPsl = cfgOptionBooleanDefault("useBlatBigPsl", FALSE) && doHyper; FILE *f; struct dnaSeq *seqList = NULL, *seq; struct tempName pslTn, faTn; int maxSingleSize, maxTotalSize, maxSeqCount; int minSingleSize = minMatchShown; char *genome, *db;