5157fdf6389da69cc64f5c0f222f9f6bc8358fec hiram Fri May 10 14:23:21 2019 -0700 better to centralize listing of legal arguments in one location refs #23437 #18869 diff --git src/hg/hubApi/getData.c src/hg/hubApi/getData.c index c83c113..34dac3b 100644 --- src/hg/hubApi/getData.c +++ src/hg/hubApi/getData.c @@ -911,42 +911,42 @@ if (fragEnd > fragStart) apiErrAbort(err400, err400Msg, "can not find sequence for chrom=%s;start=%s;end=%s for endpoint '/getData/sequence?genome=%s;chrom=%s;start=%s;end=%s' give hubUrl='%s'", chrom, start, end, genome, chrom, start, end, hubUrl); else apiErrAbort(err400, err400Msg, "can not find sequence for chrom=%s for endpoint '/getData/sequence?genome=%s;chrom=%s' give hubUrl='%s'", chrom, genome, chrom, hubUrl); } jsonWriteString(jw, "dna", seq->dna); apiFinishOutput(0, NULL, jw); } void apiGetData(char *words[MAX_PATH_INFO]) /* 'getData' function, words[1] is the subCommand */ { char *hubUrl = cgiOptionalString("hubUrl"); if (sameWord("track", words[1])) { - char *extraArgs = verifyLegalArgs("genome;hubUrl;track;chrom;start;end;maxItemsOutput;jsonOutputArrays"); + char *extraArgs = verifyLegalArgs(argsGetDataTrack); if (extraArgs) apiErrAbort(err400, err400Msg, "extraneous arguments found for function /getData/track '%s'", extraArgs); if (isNotEmpty(hubUrl)) getHubTrackData(hubUrl); else getTrackData(); } else if (sameWord("sequence", words[1])) { - char *extraArgs = verifyLegalArgs("genome;hubUrl;track;chrom;start;end"); + char *extraArgs = verifyLegalArgs(argsGetDataSequence); if (extraArgs) apiErrAbort(err400, err400Msg, "extraneous arguments found for function /getData/sequence '%s'", extraArgs); if (isNotEmpty(hubUrl)) getHubSequenceData(hubUrl); else { char *db = cgiOptionalString("genome"); if (isEmpty(db)) apiErrAbort(err400, err400Msg, "missing URL genome=<ucscDb> name for endpoint '/getData/sequence"); /* existence of db has already been proven before getting here */ getSequenceData(db, NULL); } } else