e5259878fcab4eeda7e83203e858c606b9dacf26 galt Thu Sep 21 14:11:22 2023 -0700 Disable hyperlinks hgTables output for Galaxy, show warning with explanation instead. refs #32257 diff --git src/hg/hgTables/hgTables.c src/hg/hgTables/hgTables.c index 459914b..af37fcc 100644 --- src/hg/hgTables/hgTables.c +++ src/hg/hgTables/hgTables.c @@ -1338,37 +1338,30 @@ htmlOpen("Hyperlinks to Genome Browser"); for (region = regionList; region != NULL; region = region->next) { struct lm *lm = lmInit(64*1024); struct bed *bedList, *bed; bedList = cookedBedList(conn, table, region, lm, NULL); for (bed = bedList; bed != NULL; bed = bed->next) { char *name; int start = max(0,bed->chromStart+1-outputPad); int end = min(hChromSize(database, bed->chrom),bed->chromEnd+outputPad); safef(posBuf, sizeof(posBuf), "%s:%d-%d", bed->chrom, start, end); /* Construct browser anchor URL with tracks we're looking at open. */ - if (doGalaxy()) - { - char *s, *script = hgTracksName(); - s = strstr(script, "cgi-bin"); - hPrintf("<A HREF=\"http%s://%s/%s?db=%s", cgiAppendSForHttps(), cgiServerNamePort(), s, database); - } - else hPrintf("<A HREF=\"%s?db=%s", hgTracksName(), database); hPrintf("&position=%s", posBuf); ensureVisibility(database, table, curTrack); if (table2 != NULL) { struct trackDb *tdb2 = findTrack(table2, fullTrackList); ensureVisibility(database, table2, tdb2); } hPrintf("\" TARGET=_blank>"); name = bed->name; if (bed->name == NULL) name = posBuf; if (sameString(name, posBuf)) hPrintf("%s", posBuf); else @@ -1484,60 +1477,64 @@ { cartRemove(cart, "gvDisclaimer"); cartRemove(cart, hgtaDoTopSubmit); cartSetString(cart, hgtaDoMainPage, "return to table browser"); dispatch(); return; } } if (doGenomeSpace()) { if (!checkGsReady()) return; } if (doGreat()) verifyGreatFormat(output); +if (doGalaxy()) + verifyGalaxyFormat(output); if (sameString(output, outPrimaryTable)) { if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery)) sendParamsToGalaxy(hgtaDoTopSubmit, "get output"); else doOutPrimaryTable(table, conn); } else if (sameString(output, outSelectedFields)) doOutSelectedFields(table, conn); else if (sameString(output, outSequence)) doOutSequence(conn); else if (sameString(output, outMicroarrayNames)) doOutMicroarrayNames(track); else if (sameString(output, outBed)) doOutBed(table, conn); else if (sameString(output, outCustomTrack)) doOutCustomTrack(table, conn); else if (sameString(output, outPalOptions)) doOutPalOptions( conn); else if (sameString(output, outGff)) { if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery)) sendParamsToGalaxy(hgtaDoTopSubmit, "get output"); else doOutGff(table, conn, TRUE); } else if (sameString(output, outHyperlinks)) { if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery)) - sendParamsToGalaxy(hgtaDoTopSubmit, "get output"); + { + // sendParamsToGalaxy(hgtaDoTopSubmit, "get output"); not supported anymore + } else doOutHyperlinks(table, conn); } else if (sameString(output, outWigData)) { if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery)) sendParamsToGalaxy(hgtaDoTopSubmit, "get output"); else doOutWigData(track, table, conn); } else if (sameString(output, outWigBed)) { if (doGalaxy() && !cgiOptionalString(hgtaDoGalaxyQuery)) sendParamsToGalaxy(hgtaDoTopSubmit, "get output"); else if (doGreat() && !cgiOptionalString(hgtaDoGreatQuery))