49b9c04a8f1e314efd91900c53b75105231c6ab8
tdreszer
  Tue Oct 5 16:09:46 2010 -0700
mdb val dropdown now shows cv.ra 'label' instead of val if one exists.
diff --git src/hg/hgApi/hgApi.c src/hg/hgApi/hgApi.c
index 2f9e681..58f48d5 100644
--- src/hg/hgApi/hgApi.c
+++ src/hg/hgApi/hgApi.c
@@ -96,20 +96,19 @@
     boolean metaDbExists = sqlTableExists(conn, "metaDb");
     if(metaDbExists)
         {
-        int i;
         char *var = cgiOptionalString("var");
         if(var)
             var = sqlEscapeString(var);
         else
             fail("Missing var parameter");
-        struct slName *termList = mdbValSearch(conn, var, MDB_VAL_STD_TRUNCATION, TRUE, FALSE); // Tables not files
-        struct slName *el;
+        struct slPair *pairs = mdbValLabelSearch(conn, var, MDB_VAL_STD_TRUNCATION, TRUE, FALSE); // Tables not files
+        struct slPair *pair;
         dyStringPrintf(output, "[\n");
-        for (el = termList, i = 0; el != NULL; el = el->next, i++)
+        for (pair = pairs; pair != NULL; pair = pair->next)
             {
-            if(i)
+            if(pair != pairs)
                 dyStringPrintf(output, ",\n");
-            dyStringPrintf(output, "'%s'", javaScriptLiteralEncode(el->name));
+            dyStringPrintf(output, "['%s','%s']", javaScriptLiteralEncode(pair->name), javaScriptLiteralEncode(pair->val));
             }
         dyStringPrintf(output, "\n]\n");
         }