aa1e818e2d2bd577194b0cdda7d561b93b948553 angie Mon Feb 3 16:38:55 2025 -0800 Check that the current db is the same as org before setting ctDb to it. diff --git src/hg/hgPhyloPlace/phyloPlace.c src/hg/hgPhyloPlace/phyloPlace.c index bae73edfd2a..15a5b24d791 100644 --- src/hg/hgPhyloPlace/phyloPlace.c +++ src/hg/hgPhyloPlace/phyloPlace.c @@ -3489,31 +3489,33 @@ // Add a link for every sample to this subtree, so the single-subtree JSON can // link to subtree JSONs char *subtreeUrl = nextstrainUrlFromTn(jsonTns[ix]); struct slName *sample; for (sample = ti->subtreeUserSampleIds; sample != NULL; sample = sample->next) hashAdd(sampleUrls, sample->name, subtreeUrl); } struct tempName *singleSubtreeJsonTn; AllocVar(singleSubtreeJsonTn); trashDirFile(singleSubtreeJsonTn, "hgPhyloPlace", "singleSubtreeAuspice", ".json.gz"); treeToAuspiceJson(results->singleSubtreeInfo, org, refName, geneInfoList, gSeqWin, sampleMetadata, sampleUrls, results->samplePlacements, singleSubtreeJsonTn->forCgi, source); if (subtreePersist) saveTrashFile(singleSubtreeJsonTn); reportTiming(&startTime, "make Auspice JSON"); - char *ctDb = db; + char *ctDb = NULL; + if (sameString(db, org)) + ctDb = db; char *dbSetting = phyloPlaceRefSetting(org, refName, "db"); if (dbSetting) { ctDb = connectIfHub(cart, dbSetting); } boolean canDoCustomTracks = (!subtreesOnly && ctDb != NULL); if (canDoCustomTracks) // Form submits subtree custom tracks to hgTracks printf("<form action='%s' name='resultsForm_%s' method=%s>\n\n", hgTracksName(), ctDb, cartUsualString(cart, "formMethod", "POST")); makeButtonRow(singleSubtreeJsonTn, jsonTns, results->subtreeInfoList, subtreeSize, isFasta, canDoCustomTracks); printf("<p>If you have metadata you wish to display, click a 'view subtree in " "Nextstrain' button, and then you can drag on a CSV file to "