f719b7aa89bdd4a582167d1416b2d895c25e8c62
kate
  Thu Feb 12 13:08:17 2015 -0800
Renames to fix poor name choice (meta->vocab). refs #14353

diff --git src/hg/lib/hui.c src/hg/lib/hui.c
index f25488a..28ba923 100644
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@ -4285,31 +4285,31 @@
     {
     // preserves user's prev sort/drags
     preSorted = tdbRefSortPrioritiesFromCart(cart, &subtrackRefList);
     printf("<TBODY class='%saltColors'>\n", (sortOrder != NULL ? "sortable " : "") );
     }
 else
     {
     slSort(&subtrackRefList, trackDbRefCmp);  // straight from trackDb.ra
     preSorted = TRUE;
     puts("<TBODY>");
     }
 
 // Finally the big "for loop" to list each subtrack as a table row.
 printf("\n<!-- ----- subtracks list ----- -->\n");
 membersForAll_t* membersForAll = membersForAllSubGroupsGet(parentTdb,NULL);
-struct hash *subgroupMetaHash = vocabBasicFromSetting(parentTdb, cart, "subGroupMetaTables");
+struct hash *vocabHash = vocabBasicFromSetting(parentTdb, cart, "subGroupMetaTables");
 struct slRef *subtrackRef;
 
 /* Color handling ?? */
 //char *colors[2]   = { COLOR_BG_DEFAULT,
 //                      COLOR_BG_ALTDEFAULT };
 char *colors[2]   = { "bgLevel1",
                       "bgLevel1" };
 int colorIx = settings->bgColorIx;
 
 for (subtrackRef = subtrackRefList; subtrackRef != NULL; subtrackRef = subtrackRef->next)
     {
     struct trackDb *subtrack = subtrackRef->val;
     int ix;
 
     // Determine whether subtrack is checked, visible, configurable, has group membership, etc.
@@ -4467,33 +4467,33 @@
                                 // TODO: Sort needs to expand from subGroups to labels as well
             if (ix >= 0)
                 {
                 char *term = membership->membership[ix];
                 char *title = membership->titles[ix];
                 char *titleRoot=NULL;
                 if (cvTermIsEmpty(col, title))
                     titleRoot = cloneString(" &nbsp;");
                 else
                     titleRoot = labelRoot(title, NULL);
                 // Each sortable column requires hidden goop (in the "abbr" field currently)
                 // which is the actual sort on value
                 printf("<TD id='%s_%s' abbr='%s' align='left'>", subtrack->track, col, term);
                 printf("&nbsp");
                 char *link = NULL;
-                if (subgroupMetaHash)
+                if (vocabHash)
                     {
-                    struct hash *colHash = hashFindVal(subgroupMetaHash, col);
+                    struct hash *colHash = hashFindVal(vocabHash, col);
                     if (colHash)
                         link = vocabLink(colHash, term, titleRoot);
                     }
                 printf("%s", link ? link : titleRoot);
                 puts("</TD>");
                 freeMem(titleRoot);
                 }
             else if (sameString(col, SUBTRACK_COLOR_SUBGROUP))
                 {
                 char *hue = subtrackColorToCompare(subtrack);
                 printf("<TD id='%s_%s' abbr='%s' bgcolor='#%02X%02X%02X'>"
                         "&nbsp;&nbsp;&nbsp;&nbsp;</TD>",
                     subtrack->track, col, hue, 
                         subtrack->colorR, subtrack->colorG, subtrack->colorB);
                 }