3329f549f0718e84b05bff2c792cdfe697d8d209 braney Tue Apr 22 17:20:18 2014 -0700 some tweaks in response to code review. Provide a default assembly nameinstead of (null), and add default case to switches on enumerated typed variables. refs #13118 diff --git src/hg/hgCustom/hgCustom.c src/hg/hgCustom/hgCustom.c index 25f3a6c..e508565 100644 --- src/hg/hgCustom/hgCustom.c +++ src/hg/hgCustom/hgCustom.c @@ -703,32 +703,38 @@ /* Print clade, genome and assembly */ 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();\""; puts("<TABLE BORDER=0>\n"); puts("<TR><TD>genome\n"); printSomeGenomeListHtml(database, dbList, onChangeOrg); puts(" "); puts("assembly\n"); printSomeAssemblyListHtml(database, dbList, onChangeDb); puts(" "); printf("[%s]", database); puts("</TD></TR></TABLE><P>\n"); } else + { + char *assemblyName = hFreezeDateOpt(database); + if (assemblyName == NULL) + assemblyName = "default"; + printf("<B>genome:</B> %s <B>assembly:</B> %s [%s]\n", - organism, hFreezeDateOpt(database), database); + organism, assemblyName, database); + } if (measureTiming && (loadTime > 0)) printf("\n<BR>load time: %ld ms<BR>\n", loadTime); /* place for warning messages to appear */ if (isNotEmpty(warn)) { char *encoded = htmlEncode(warn); printf("<P><B> %s", encoded); freeMem(encoded); } /* count up number of custom tracks for this genome */ int numCts = slCount(ctList); cgiSimpleTableStart();