aecff87074bb35effb6ee1620132f69466807409 hiram Tue Nov 14 11:18:57 2017 -0800 change the variable name warn to warnMsg to avoid clash with same name function no redmine diff --git src/hg/hgCustom/hgCustom.c src/hg/hgCustom/hgCustom.c index 5cca72a..dac69a6 100644 --- src/hg/hgCustom/hgCustom.c +++ src/hg/hgCustom/hgCustom.c @@ -675,31 +675,31 @@ char *defaultCgi = valsAndLabels->name; char *selected = cartUsualString(cart, hgCtNavDest, defaultCgi); printf("
\n", selected); cartSaveSession(cart); if (pos) cgiMakeHiddenVar("position", pos); printf("view in "); // Construct a menu of destination CGIs puts(cgiMakeSingleSelectDropList(hgCtNavDest, valsAndLabels, selected, NULL, NULL, "change", "var newVal = $('#navSelect').val(); $('#navForm').attr('action', newVal);", NULL, "navSelect")); cgiMakeButton("submit", "go"); puts("
"); } -static void manageCustomForm(char *warn) +static void manageCustomForm(char *warnMsg) /* list custom tracks and display checkboxes so user can select for delete */ { struct dbDb *dbList = getCustomTrackDatabases(); struct dbDb *dbDb = NULL; /* add this database to the list, as it may have no custom * tracks, but we still want to see it in the menu */ slAddTail(&dbList, hDbDb(database)); slReverse(&dbList); /* remove duplicate entry for this database, if any */ for (dbDb = dbList->next; dbDb != NULL; dbDb = dbDb->next) if (sameString(dbDb->name, database)) slRemoveEl(&dbList, dbDb); boolean assemblyMenu = FALSE; @@ -738,33 +738,33 @@ puts("

\n"); } else { char *assemblyName = hFreezeDateOpt(database); if (assemblyName == NULL) assemblyName = "default"; printf("genome: %s    assembly: %s    [%s]\n", organism, assemblyName, database); } if (measureTiming && (loadTime > 0)) printf("\n
load time: %ld ms
\n", loadTime); /* place for warning messages to appear */ -if (isNotEmpty(warn)) +if (isNotEmpty(warnMsg)) { - char *encoded = htmlEncode(warn); + char *encoded = htmlEncode(warnMsg); printf("

    %s", encoded); freeMem(encoded); } /* count up number of custom tracks for this genome */ int numCts = slCount(ctList); cgiSimpleTableStart(); cgiSimpleTableRowStart(); if (numCts) { puts(""); showCustomTrackList(ctList, numCts); } else @@ -936,37 +936,37 @@ void doUpdateCustom(struct customTrack *ct, char *err) /* display form for adding custom tracks. * Include error message, if any */ { char *longLabel = htmlEncode(ct->tdb->longLabel); cartWebStart(cart, database, "Update Custom Track: %s [%s]", longLabel, database); freeMem(longLabel); cartSetString(cart, hgCtDocText, ct->tdb->html); addCustomForm(ct, err); helpCustom(); cartWebEnd(cart); } -static void doManageCustom(char *warn) +static void doManageCustom(char *warnMsg) /* display form for deleting & updating custom tracks. * Include warning message, if any */ { cartWebStart(cart, database, "Manage Custom Tracks"); jsIncludeFile("jquery.js", NULL); -manageCustomForm(warn); +manageCustomForm(warnMsg); webNewSection("Managing Custom Tracks"); webIncludeHelpFile("customTrackManage", FALSE); cartWebEnd(cart); } char *fixNewData(struct cart *cart) /* append a newline to incoming data, to keep custom preprocessor happy */ { char *customText = cartUsualString(cart, hgCtDataText, ""); if (isNotEmpty(customText)) { struct dyString *ds = dyStringNew(0); dyStringPrintf(ds, "%s\n", customText); customText = dyStringCannibalize(&ds); cartSetString(cart, hgCtDataText, customText); @@ -994,57 +994,57 @@ } void doDeleteCustom() /* remove custom tracks from list based on cart variables */ { struct customTrack *ct; for (ct = ctList; ct != NULL; ct = ct->next) { char var[256]; safef(var, sizeof var, "%s_%s", hgCtDeletePrefix, ct->tdb->track); if (cartBoolean(cart, var)) slRemoveEl(&ctList, ct); } } -void doRefreshCustom(char **warn) +void doRefreshCustom(char **warnMsg) /* reparse custom tracks from URLs based on cart variables */ { struct customTrack *ct; struct customTrack *replacedCts = NULL; struct customTrack *refreshCts = NULL; for (ct = ctList; ct != NULL; ct = ct->next) { char var[256]; safef(var, sizeof var, "%s_%s", hgCtRefreshPrefix, ct->tdb->track); if (cartUsualBoolean(cart, var, FALSE)) { struct customTrack *nextCt = NULL, *urlCt = NULL; struct customTrack *urlCts = customFactoryParse(database, ctDataUrl(ct), FALSE, NULL); for (urlCt = urlCts; urlCt != NULL; urlCt = nextCt) { nextCt = urlCt->next; if (sameString(ct->tdb->track, urlCt->tdb->track)) slAddHead(&refreshCts, urlCt); } } } ctList = customTrackAddToList(ctList, refreshCts, &replacedCts, FALSE); -if (warn) - *warn = replacedTracksMsg(replacedCts); +if (warnMsg) + *warnMsg = replacedTracksMsg(replacedCts); customTrackHandleLift(database, ctList); } void addWarning(struct dyString *ds, char *msg) /* build up a warning message from parts */ { if (!msg) return; if (isNotEmpty(ds->string)) dyStringAppend(ds, ". "); dyStringAppend(ds, msg); } char *saveLines(char *text, int max) /* save lines from input, up to 'max'. @@ -1109,31 +1109,31 @@ // White space (spaces, newlines, tabs, and comments) may appear before or after each section [including the DOCTYPE]. // // So we print out comments periodically to keep this process from being killed by apache or the user's web browser. printf("\n", timerCounter++ * TIMER_INTERVAL); fflush(stdout); alarm(TIMER_INTERVAL); } void doMiddle(struct cart *theCart) /* create web page */ { char *ctFileName = NULL; struct slName *browserLines = NULL; struct customTrack *replacedCts = NULL; -char *err = NULL, *warn = NULL; +char *err = NULL, *warnMsg = NULL; char *selectedTable = NULL; struct customTrack *ct = NULL; boolean ctUpdated = FALSE; char *initialDb = NULL; long thisTime = clock1000(); cart = theCart; measureTiming = isNotEmpty(cartOptionalString(cart, "measureTiming")); initialDb = cloneString(cartUsualString(cart, "db", "")); getDbAndGenome(cart, &database, &organism, oldVars); customFactoryEnableExtraChecking(TRUE); knetUdcInstall(); @@ -1283,86 +1283,86 @@ { struct errCatch *catch = errCatchNew(); if (errCatchStart(catch)) { customTrackUpdateFromConfig(ct, database, trackConfig, &browserLines); ctUpdated = TRUE; } errCatchEnd(catch); if (catch->gotError) addWarning(dsWarn, catch->message->string); errCatchFree(&catch); } } } addWarning(dsWarn, replacedTracksMsg(replacedCts)); - doBrowserLines(browserLines, &warn); - addWarning(dsWarn, warn); + doBrowserLines(browserLines, &warnMsg); + addWarning(dsWarn, warnMsg); if (err) { char *selectedTable = NULL; cartSetString(cart, hgCtDataText, savedCustomText); cartSetString(cart, hgCtConfigLines, savedConfig); if ((selectedTable= cartOptionalString(cart, hgCtUpdatedTable)) != NULL) { ct = ctFromList(ctList, selectedTable); doUpdateCustom(ct, err); } else doAddCustom(err); cartRemovePrefix(cart, hgCt); return; } if (cartVarExists(cart, hgCtDoDelete)) { doDeleteCustom(); ctUpdated = TRUE; } if (cartVarExists(cart, hgCtDoRefresh)) { - doRefreshCustom(&warn); - addWarning(dsWarn, warn); + doRefreshCustom(&warnMsg); + addWarning(dsWarn, warnMsg); ctUpdated = TRUE; } if (ctUpdated || ctConfigUpdate(ctFileName)) { customTracksSaveCart(database, cart, ctList); /* refresh ctList again to pickup remote resource error state */ struct errCatch *catch = errCatchNew(); if (errCatchStart(catch)) ctList = customTracksParseCartDetailed(database, cart, &browserLines, &ctFileName, &replacedCts, NULL, &err); errCatchEnd(catch); if (catch->gotError) { addWarning(dsWarn, err); addWarning(dsWarn, catch->message->string); } errCatchFree(&catch); } - warn = dyStringCannibalize(&dsWarn); + warnMsg = dyStringCannibalize(&dsWarn); if (measureTiming) { long lastTime = clock1000(); loadTime = lastTime - thisTime; } if (ctList || cartVarExists(cart, hgCtDoDelete)) - doManageCustom(warn); + doManageCustom(warnMsg); else - doAddCustom(warn); + doAddCustom(warnMsg); } cartRemovePrefix(cart, hgCt); cartRemove(cart, CT_CUSTOM_TEXT_VAR); } int main(int argc, char *argv[]) /* Process command line. */ { long enteredMainTime = clock1000(); htmlPushEarlyHandlers(); oldVars = hashNew(10); cgiSpoof(&argc, argv); cartEmptyShell(doMiddle, hUserCookie(), excludeVars, oldVars); cgiExitTime("hgCustom", enteredMainTime);