6419fc05af66878081e2b7d4d944900ec42d7cb1 tdreszer Fri Jun 22 15:29:37 2012 -0700 First 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/hgGeneRing/hgGeneRing.c src/hg/hgGeneRing/hgGeneRing.c index 7bb8fb0..34821b2 100644 --- src/hg/hgGeneRing/hgGeneRing.c +++ src/hg/hgGeneRing/hgGeneRing.c @@ -65,64 +65,59 @@ { char *defaultPosition = hDefaultPos(db); char *position = cloneString(cartUsualString(cart, "position", defaultPosition)); boolean gotClade = hGotClade(); /* JavaScript to copy input data on the change genome button to a hidden form This was done in order to be able to flexibly arrange the UI HTML */ 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 (sameString(position, "genome") || sameString(position, "hgBatch")) position = defaultPosition; -puts( -"
\n" +puts("\n" "
" "\n" "
\n" "The UCSC Genome Browser was created by the \n" "Genome Bioinformatics Group of UC Santa Cruz.\n" "
" "Software Copyright (c) The Regents of the University of California.\n" "All rights reserved.\n" -"
\n" -); + "\n"); -puts( -"\n" +puts("\n" "
\n" "\n" "
\n" "\n" "
\n" "\n" "\n" "
\n" ""); if (gotClade) puts(""); -puts( -"\n" +puts("\n" "\n" "\n" "\n" "\n" -"\n" -); + "\n"); if (gotClade) { puts("\n"); } puts("\n"); @@ -153,43 +148,40 @@ cartSetString(cart, "org", organism); if (gotClade) cartSetString(cart, "clade", clade); freez(&defaultPosition); position = NULL; puts("\n"); printf("\n"); -puts( -"
cladegenomegenomeassemblypositionimage width  
\n"); printCladeListHtml(organism, onChangeClade); puts("\n"); if (gotClade) printGenomeListForCladeHtml(db, onChangeOrg); else printGenomeListHtml(db, onChangeOrg); puts("\n"); cgiMakeIntVar("pix", cartUsualInt(cart, "pix", hgDefaultPixWidth), 4); cartSaveSession(cart); printf(""); cgiMakeButton("Submit", "Submit"); printf("
\n" +puts("
\n" "
\n" "Click here to reset the browser user interface settings to their defaults.
\n" "
\n" -"
\n" -); + "
\n"); cgiMakeButton("customTrackPage", "Add Your Own Custom Tracks"); puts("
\n" "
\n" "
\n" -"\n" -); + "\n"); puts("
"); hgPositionsHelpHtml(organism, db); puts("
\n" ); puts("
"); if (gotClade) printf("\n", clade); printf("\n", organism); printf("\n", db); cartSaveSession(cart); puts("

"); } @@ -369,60 +361,52 @@ void getGeneList() /* hgGeneRing - Gene Network Browser. */ { /* not much point in this, though called old it's the same as current at this point. It is not the old value from before the last submit. char *oldGeneList = hashFindVal(oldVars, "ring_geneList"); */ if (!sameString(errMsg,"")) { printf("
%s
\n",errMsg); } -puts( -"
\n" +puts("\n" "
" "\n" "
\n" "Enter gene list for gene network ring.\n" -"
\n" -); + "\n"); -puts( -"
" +puts("
" "\n" -"\n" -); + "\n"); puts("\n"); -puts( -"\n" -); +puts("\n"); printf("\n"); -puts( -"
\n"); cgiMakeTextArea("ring_geneList", geneList, 25, 30); printf("
"); cgiMakeButton("Submit", "Submit"); printf("
\n" -); +puts("
\n"); puts("
\n"); cartSetString(cart, "ring_action", "saveGeneList"); cartSetString(cart, "ring_errMsg", ""); } int compareNodes(const void *va, const void *vb) { const struct nodelist *a = *((struct nodelist **)va); const struct nodelist *b = *((struct nodelist **)vb); if (a->node->ring && !b->node->ring) return -1; if (!a->node->ring && b->node->ring) return 1; if (a->node->ring && b->node->ring) @@ -445,47 +429,39 @@ Otherwise, show user's list and offer some links. */ { struct interaction* intr; struct nodelist *nl; if (!getGenesAsList()) { getGeneList(); return FALSE; } if (showAll) { - puts( - "
" + puts("
" "\n" - "
\n" - ); - printf("geneList: %s
\n", - geneList - ); - puts( - "
" + "
\n"); + printf("geneList: %s
\n", geneList ); + puts("
" "gene-list\n" "
" - "screen\n" - ); - puts( - "
\n" - ); + "screen\n"); + puts("
\n"); } interactions = getGenesFromTable("intrP2P"); /* adds geneList elements to hash */ if (showAll) { uglyf("slCount = %d for result list for %s.

\n",slCount(interactions),geneList); } /* this might get moved later */ /* add to hash the remaining interactions members */ for(intr=interactions;intr;intr=intr->next) {