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/hgCustom/hgCustom.c src/hg/hgCustom/hgCustom.c index 03f56d2..e67120c 100644 --- src/hg/hgCustom/hgCustom.c +++ src/hg/hgCustom/hgCustom.c @@ -176,31 +176,32 @@ printf("<FORM ACTION=\"%s\" METHOD=\"%s\" " " ENCTYPE=\"multipart/form-data\" NAME=\"mainForm\" onsubmit=\"$('input[name=Submit]').attr('disabled', 'disabled');\" >\n", hgCustomName(), cartUsualString(cart, "formMethod", "POST")); cartSaveSession(cart); if (!isUpdateForm) { /* Print clade, genome and assembly */ /* NOTE: this uses an additional, hidden form (orgForm), below */ char *onChangeDb = "onchange=\"document.orgForm.db.value = document.mainForm.db.options[document.mainForm.db.selectedIndex].value; document.orgForm.submit();\""; char *onChangeOrg = "onchange=\"document.orgForm.org.value = document.mainForm.org.options[document.mainForm.org.selectedIndex].value; document.orgForm.db.value = 0; document.orgForm.submit();\""; char *onChangeClade = "onchange=\"document.orgForm.clade.value = document.mainForm.clade.options[document.mainForm.clade.selectedIndex].value; document.orgForm.org.value = 0; document.orgForm.db.value = 0; document.orgForm.submit();\""; if (hIsGsidServer()) { - printf("<span style='color:red;'>The Custom Track function and its documentation is currently under development ...</span><BR><BR>\n"); + printf("<span style='color:red;'>The Custom Track function and its documentation is " + "currently under development ...</span><BR><BR>\n"); } puts("<TABLE BORDER=0>\n"); if (gotClade) { puts("<TR><TD>clade\n"); printCladeListHtml(hOrganism(database), onChangeClade); puts(" "); puts("genome\n"); printGenomeListForCladeHtml(database, onChangeOrg); } else { puts("<TR><TD>genome\n"); printGenomeListHtml(database, onChangeOrg); @@ -215,31 +216,32 @@ } puts("</TD></TR></TABLE>\n"); } /* intro text */ puts("<P>"); if (isUpdateForm) puts("Update your custom track configuration, data, and/or documentation."); else puts("Display your own data as custom annotation tracks in the browser."); addIntro(); puts("<P>"); /* row for error message */ if (err) - printf("<P><B> <span style='color:RED; font-style:italic;'>Error</span> %s</B><P>", err); + printf("<P><B> <span style='color:RED; font-style:italic;'>" + "Error</span> %s</B><P>", err); cgiSimpleTableStart(); /* first rows for update form are for track and browser line entry */ if (isUpdateForm) { /* row for instructions */ cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); if (dataUrl) puts("Configuration:"); else { puts("Edit configuration:"); } @@ -1108,34 +1110,32 @@ /* when an organism is selected from the custom track management page, * set the database to be the default only if it has custom tracks. * Otherwise, pick an assembly for that organism that does have custom tracks. */ struct dbDb *dbDb, *dbDbs = getCustomTrackDatabases(); char *dbWithCts = NULL; for (dbDb = dbDbs; dbDb != NULL; dbDb = dbDb->next) { if (sameString(database, dbDb->name)) break; if (sameString(organism, dbDb->organism)) { if (!dbWithCts) dbWithCts = cloneString(dbDb->name); } } - if (dbWithCts) - /* set the database for the selected organism to an assembly that - * has custom tracks */ - { + if (dbWithCts) // set the database for the selected organism to an assembly that + { // has custom tracks database = dbWithCts; cartSetString(cart, "db", database); } } if (cartVarExists(cart, hgCtDoAdd)) doAddCustom(NULL); #ifdef PROGRESS_METER else if (cartVarExists(cart, hgCtDoProgress)) { doProgress(NULL); } #endif else if (cartVarExists(cart, hgCtTable)) {