| %s", ri->recombNodeId);
if (startsWith("node_", ri->recombNodeId))
{
@@ -3516,31 +3516,32 @@
slNameFreeList(&unmatched);
reportTiming(&startTime, "look up uploaded sample names");
}
lineFileClose(&lf);
if (sampleIds == NULL)
{
return;
}
// Kick off child thread to load metadata simultaneously with running usher or matUtils.
pthread_t *metadataPthread = mayStartLoaderPthread(metadataFile, loadMetadataWorker);
struct usherResults *results = NULL;
char *anchorFile = phyloPlaceRefSettingPath(org, refName, "anchorSamples");
char *ripplesEnabledSetting = phyloPlaceOrgSetting(org, "ripplesEnabled");
-boolean ripplesEnabled = (isNotEmpty(ripplesEnabledSetting) && SETTING_IS_ON(ripplesEnabledSetting));
+boolean ripplesEnabled = (isNotEmpty(ripplesEnabledSetting) && SETTING_IS_ON(ripplesEnabledSetting) &&
+ cartUsualBoolean(cart, "doRipples", FALSE));
boolean doRipples = (ripplesEnabled && slCount(sampleIds) <= MAX_RIPPLES_SEARCH);
if (vcfTn)
{
fflush(stdout);
results = runUsher(org, usherPath, protobufPath, vcfTn->forCgi, subtreeSize, &sampleIds,
treeChoices, anchorFile, doRipples, refGenome->size, &startTime);
}
else if (subtreesOnly)
{
char *matUtilsPath = getMatUtilsPath(TRUE);
results = runMatUtilsExtractSubtrees(org, matUtilsPath, protobufPath, subtreeSize,
sampleIds, treeChoices, anchorFile, refGenome->size, &startTime);
}
struct sampleMetadataStore *sampleMetadata = NULL;
|