1b0022d477256a3812b43b8e1b3ced609e0ceabb angie Thu Jun 27 10:32:39 2019 -0700 Don't erase cart var multiRegionsBedUrl when files have disappeared in checkmultiRegionsBedInput; wait until initVirtRegionsFromBedUrl so we get the error message about the files disappearing, not unspecified file. refs #22440 diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 1ab4382..32f3637 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3981,36 +3981,30 @@ char *newMultiRegionsBedUrl = NULL; multiRegionsBedUrl = cartUsualString(cart, "multiRegionsBedUrl", multiRegionsBedUrl); char multiRegionsBedUrlSha1Name[1024]; safef(multiRegionsBedUrlSha1Name, sizeof multiRegionsBedUrlSha1Name, "%s.sha1", multiRegionsBedUrl); if (!multiRegionsBedUrl) { multiRegionsBedUrl = ""; cartSetString(cart, "multiRegionsBedUrl", multiRegionsBedUrl); } if (sameString(multiRegionsBedUrl,"")) oldType = empty; else if (strstr(multiRegionsBedUrl,"://")) oldType = url; else oldType = trashFile; -if ((oldType == trashFile) && !(fileExists(multiRegionsBedUrl) && fileExists(multiRegionsBedUrlSha1Name))) - { // if the trash files no longer exists, reset to empty string default value. - multiRegionsBedUrl = ""; - cartSetString(cart, "multiRegionsBedUrl", multiRegionsBedUrl); - oldType = empty; - } // NEW input char *multiRegionsBedInput = cartOptionalString(cart, "multiRegionsBedInput"); if (!multiRegionsBedInput) return; // create cleaned up dyString from input. // remove blank lines, trim leading and trailing spaces, change CRLF from TEXTAREA input to LF. struct dyString *dyInput = dyStringNew(1024); char *input = cloneString(multiRegionsBedInput); // make a copy, linefile modifies struct lineFile *lf = lineFileOnString("multiRegionsBedInput", TRUE, input); char *line; int lineSize; while (lineFileNext(lf, &line, &lineSize))