78dfd4b6e906a962da40780c799f92bb7ea1b3c1
kent
  Wed Jan 12 15:47:29 2011 -0800
Starting to integrate data hub into table browser.  Still problems, so effectively is commented out at the moment.
diff --git src/hg/hgTables/mainPage.c src/hg/hgTables/mainPage.c
index 6b68ae2..8615f96 100644
--- src/hg/hgTables/mainPage.c
+++ src/hg/hgTables/mainPage.c
@@ -97,31 +97,31 @@
 jsDropDownCarryOver(dy, hgtaTable);
 return jsOnChangeEnd(&dy);
 }
 
 void makeRegionButton(char *val, char *selVal)
 /* Make region radio button including a little Javascript
  * to save selection state. */
 {
 jsMakeTrackingRadioButton(hgtaRegionType, "regionType", val, selVal);
 }
 
 struct grp *showGroupField(char *groupVar, char *groupScript,
     struct sqlConnection *conn, boolean allTablesOk)
 /* Show group control. Returns selected group. */
 {
-struct grp *group, *groupList = makeGroupList(fullTrackList, allTablesOk);
+struct grp *group, *groupList = fullGroupList;
 struct grp *selGroup = findSelectedGroup(groupList, groupVar);
 hPrintf("<B>group:</B>\n");
 hPrintf("<SELECT NAME=%s %s>\n", groupVar, groupScript);
 for (group = groupList; group != NULL; group = group->next)
     {
     hPrintf(" <OPTION VALUE=%s%s>%s\n", group->name,
 	(group == selGroup ? " SELECTED" : ""),
 	group->label);
     }
 hPrintf("</SELECT>\n");
 return selGroup;
 }
 
 static void addIfExists(struct hash *hash, struct slName **pList, char *name)
 /* Add name to tail of list if it exists in hash. */
@@ -805,31 +805,31 @@
         {
 	hPrintf("<TR><TD><B>intersection:</B>\n");
 	cgiMakeButton(hgtaDoIntersectPage, "create");
 	}
     hPrintf("</TD></TR>\n");
     }
 
 /* Correlation line. */
 struct trackDb *tdb = findTdbForTable(database, curTrack, curTable, ctLookupName);
 if (correlateTrackTableOK(tdb, curTable))
     {
     char *table2 = cartUsualString(cart, hgtaCorrelateTable, "none");
     hPrintf("<TR><TD><B>correlation:</B>\n");
     if (differentWord(table2,"none") && strlen(table2))
         {
-        struct grp *groupList = makeGroupList(fullTrackList, TRUE);
+        struct grp *groupList = fullGroupList;
         struct grp *selGroup = findSelectedGroup(groupList, hgtaCorrelateGroup);
         struct trackDb *tdb2 = findSelectedTrack(fullTrackList, selGroup,hgtaCorrelateTrack);
         if (tdbIsComposite(tdb2))
             {
 	    struct slRef *tdbRefList = trackDbListGetRefsToDescendantLeaves(tdb2->subtracks);
 	    struct slRef *tdbRef;
 	    for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
                 {
 		struct trackDb *subTdb = tdbRef->val;
                 if (sameString(table2, subTdb->table))
                     {
                     tdb2 = subTdb;
                     break;
                     }
                 }