1a89c8e587e4cdbdb94430448caaa19247871cb8
tdreszer
Thu Sep 22 13:01:11 2011 -0700
Big load of changes for subCfg.
diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index 723807b..c91410d 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -2711,35 +2711,32 @@
}
}
}
#endif /* UNUSED */
void trackUi(struct trackDb *tdb, struct trackDb *tdbList, struct customTrack *ct, boolean ajax)
/* Put up track-specific user interface. */
{
if (!ajax)
{
jsIncludeFile("jquery.js", NULL);
webIncludeResourceFile("jquery-ui.css");
jsIncludeFile("jquery-ui.js", NULL);
jsIncludeFile("utils.js",NULL);
-#ifdef NEW_JQUERY
- printf("\n");
-#else///ifndef NEW_JQUERY
- printf("\n");
-#endif///ndef NEW_JQUERY
+ jsonHashAddString(NULL, "track", tdb->track);
+ jsonHashAddString(NULL, "db", database);
}
#define RESET_TO_DEFAULTS "defaults"
char setting[128];
// NOTE: Currently only composite multi-view tracks because
// reset relies upon all cart vars following naming convention:
// {track}.{varName}... ( One exception supported: {track}_sel ).
if (trackDbLocalSetting(tdb, "container"))
{
/* For the moment, be a composite... */
tdbMarkAsComposite(tdb);
}
if (ajax && cartOptionalString(cart, "descriptionOnly"))
{
@@ -3092,30 +3089,31 @@
}
}
char *title = (tdbIsSuper(tdb) ? "Super-track Settings" :
tdbIsDownloadsOnly(tdb) ? DOWNLOADS_ONLY_TITLE : "Track Settings");
if(cartOptionalString(cart, "ajax"))
{
// html is going to be used w/n a dialog in hgTracks.js so serve up stripped down html
trackUi(tdb, tdbList, ct, TRUE);
cartRemove(cart,"ajax");
}
else
{
cartWebStart(cart, database, "%s %s", tdb->shortLabel, title);
trackUi(tdb, tdbList, ct, FALSE);
printf("
\n");
+ jsonPrintGlobals(TRUE);
webEnd();
}
}
char *excludeVars[] = { "submit", "Submit", "g", NULL, "ajax", NULL,};
int main(int argc, char *argv[])
/* Process command line. */
{
cgiSpoof(&argc, argv);
htmlSetBackground(hBackgroundImage());
setUdcCacheDir();
cartEmptyShell(doMiddle, hUserCookie(), excludeVars, NULL);
return 0;
}