3a3e7f9931622d8837bf08c3de5dfb328c384203 tdreszer Fri Jun 22 15:59:56 2012 -0700 Third batch of many checkins as dictated by Jim's OCD. Formatting space after if and limiting lines to 100 chars. Changes limited to lines last touched by tdreszer (git blame) so as not to ruin history. None of these changes should affect executables in any way. Only affect is to my sanity and Jim's. diff --git src/hg/hgFileUi/hgFileUi.c src/hg/hgFileUi/hgFileUi.c index ef71f51..a47a296 100644 --- src/hg/hgFileUi/hgFileUi.c +++ src/hg/hgFileUi/hgFileUi.c @@ -1,16 +1,15 @@ - #include "common.h" #include "hash.h" #include "cheapcgi.h" #include "htmshell.h" #include "jsHelper.h" #include "trackDb.h" #include "hdb.h" #include "web.h" #include "mdb.h" #include "hCommon.h" #include "hui.h" #include "fileUi.h" #define MAIN_FORM "mainForm" #define WIGGLE_HELP_PAGE "../goldenPath/help/hgWiggleTrackHelp.html" @@ -21,57 +20,64 @@ if (!ajax) { jsIncludeFile("jquery.js", NULL); webIncludeResourceFile("jquery-ui.css"); jsIncludeFile("jquery-ui.js", NULL); jsIncludeFile("utils.js",NULL); } // QUESTION: Is this needed? Are we doing a submit on hgTrackUi to get here?? Probably not. //if(tdbIsContainer(tdb) && !ajax) // cartTdbTreeReshapeIfNeeded(cart,tdb); printf("%s\n", tdb->longLabel); // If Composite, link to the hgTrackUi. But if downloadsOnly then link to any superTrack. -#define LINK_TO_PARENT "%s(%s)\n" +#define LINK_TO_PARENT "%s(%s)\n" if (tdbIsComposite(tdb)) { char *encodedTrackName = cgiEncode(tdb->track); - printf(LINK_TO_PARENT,"  ", hgTrackUiName(), cartSessionVarName(), cartSessionId(cart), chrom, encodedTrackName,tdb->shortLabel,"Track settings"); + printf(LINK_TO_PARENT,"  ", hgTrackUiName(), cartSessionVarName(), + cartSessionId(cart), chrom, encodedTrackName,tdb->shortLabel,"Track settings"); freeMem(encodedTrackName); } else if (tdb->parent) //Print link for parent track { char *encodedTrackName = cgiEncode(tdb->parent->track); - printf(LINK_TO_PARENT,"  ", hgTrackUiName(), cartSessionVarName(), cartSessionId(cart), chrom, encodedTrackName, tdb->parent->shortLabel, tdb->parent->shortLabel); + printf(LINK_TO_PARENT,"  ", hgTrackUiName(), cartSessionVarName(), + cartSessionId(cart), chrom, encodedTrackName, tdb->parent->shortLabel, + tdb->parent->shortLabel); freeMem(encodedTrackName); } // NAVLINKS - Link to Description down below if (tdb->html != NULL && tdb->html[0] != 0) { printf(""); } puts("
"); filesDownloadUi(db,cart,tdb); // Print data version trackDB setting, if any */ char *version = trackDbSetting(tdb, "dataVersion"); if (version) { cgiDown(0.7); printf("Data version: %s
\n", version); } // Print lift information from trackDb, if any @@ -122,25 +128,25 @@ } cartWebStart(cart, db, "%s %s", tdb->shortLabel, DOWNLOADS_ONLY_TITLE); if (!tdbIsComposite(tdb) && !tdbIsDownloadsOnly(tdb)) { warn("Track '%s' of type %s is not supported by hgFileUi.",track, tdb->type); return; } fileUi(cart, tdb, db, chrom, FALSE); printf("
\n"); webEnd(); } -char *excludeVars[] = { "submit", "Submit", "g", "clearCache", "ajax", NULL,}; // HOW IS 'ajax" going to be supported? +char *excludeVars[] = { "submit", "Submit", "g", "clearCache", "ajax", NULL,}; int main(int argc, char *argv[]) /* Process command line. */ { cgiSpoof(&argc, argv); htmlSetBackground(hBackgroundImage()); cartEmptyShell(doMiddle, hUserCookie(), excludeVars, NULL); return 0; }