addc18fca8d5b05507a3c3b9e22d08bd35280434
kate
  Thu Feb 12 11:55:29 2015 -0800
Renames to fix poor name choice (meta->vocab). refs #14353

diff --git src/hg/hgc/peakClusters.c src/hg/hgc/peakClusters.c
index ece91c9..d2663ce 100644
--- src/hg/hgc/peakClusters.c
+++ src/hg/hgc/peakClusters.c
@@ -88,31 +88,31 @@
 struct slName *field;
 for (i=0, field = fieldList; i<fieldCount; ++i, field = field->next)
     {
     char *link = NULL;
     char *fieldVal = row[i];
     if (vocabFile && hashLookup(vocabHash, field->name))
         {
         // controlled vocabulary
         link = controlledVocabLink(vocabFile, "term", fieldVal, fieldVal, fieldVal, "");
         }
     else if (!vocabFile && vocabHash != NULL)
         {
         // meta tables
         struct hash *fieldHash = hashFindVal(vocabHash, field->name);
         if (fieldHash != NULL)
-            link = metaVocabLink(fieldHash, fieldVal, fieldVal);
+            link = vocabLink(fieldHash, fieldVal, fieldVal);
 
         }
     webPrintLinkCell(link != NULL ? link : fieldVal);
     }
 }
 
 static void printMetadataForTable(char *table)
 /* If table exists, _and_ tdb associated with it exists, print out
  * a metadata link that expands on click.  Otherwise print "unavailable" */
 {
 webPrintLinkCellStart();
 struct trackDb *tdb = hashFindVal(trackHash, table);
 if (tdb == NULL)
     printf("%s info n/a", table);
 else if (!compositeMetadataToggle(database, tdb, "metadata", TRUE, FALSE))
@@ -146,31 +146,31 @@
 /* Get vocabulary term hash */
 {
 struct hash *hash = raTagVals(fileName, "type");
 hashAdd(hash, "cellType", NULL);	/* Will the kludge never end, no, never! */
 return hash;
 }
 
 static void getVocab(struct trackDb *tdb, struct cart *cart, 
                         char **vocabFile, struct hash **vocabHash)
 /* Get vocabulary info from trackDb settings (CV or meta tables) */
 {
 
 char *file = NULL;
 struct hash *hash = NULL;
 char *vocab = trackDbSetting(tdb, "controlledVocabulary");
-struct hash *metaHash = metaBasicFromSetting(tdb, cart, "inputFieldMetaTables");
+struct hash *metaHash = vocabBasicFromSetting(tdb, cart, "inputFieldMetaTables");
 if (vocab)
     {
     file = cloneFirstWord(vocab);
     hash = getVocabHash(file);
     }
 else if (metaHash)
     {
     hash = metaHash;
     }
 if (vocabFile != NULL)
     *vocabFile = file;
 if (hash != NULL)
     *vocabHash = hash;
 }