37cca719b0da877b05e1e45f63f511646e837423
larrym
  Thu Oct 21 15:44:00 2010 -0700
remove metaDbExists parameter from printMdbSelects call
diff --git src/hg/hgTracks/searchTracks.c src/hg/hgTracks/searchTracks.c
index 583bb5f..c9c50e7 100644
--- src/hg/hgTracks/searchTracks.c
+++ src/hg/hgTracks/searchTracks.c
@@ -265,7 +265,7 @@
 #endif///ndef WHITE_LIST_COUNT
 }
 
-static int printMdbSelects(struct sqlConnection *conn,struct cart *cart,boolean metaDbExists,boolean simpleSearch,char ***pMdbVar,char ***pMdbVal,int *numMetadataNonEmpty,int cols)
+static int printMdbSelects(struct sqlConnection *conn,struct cart *cart,boolean simpleSearch,char ***pMdbVar,char ***pMdbVal,int *numMetadataNonEmpty,int cols)
 // Prints a table of mdb selects if appropriate and returns number of them
 {
 // figure out how many metadata selects are visible.
@@ -274,6 +274,9 @@
 int numMetadataSelects = 0;
 char **mdbVar = NULL;
 char **mdbVal = NULL;
+int i, count;
+char **mdbVars = NULL;
+char **mdbVarLabels = NULL;
 
 for(;;)
     {
@@ -310,6 +313,7 @@
             offset = 1;
         safef(buf, sizeof(buf), "%s%d", METADATA_NAME_PREFIX, i + offset);
         mdbVar[i] = cloneString(cartOptionalString(cart, buf));
+        // XXXX we need to make sure mdbVar[i] is valid in this assembly
         if(!simpleSearch)
             {
             safef(buf, sizeof(buf), "%s%d", METADATA_VALUE_PREFIX, i + offset);
@@ -341,12 +345,7 @@
     mdbVal[1] = ANYLABEL;
     }
 
-if(metaDbExists)
-    {
-    int i;
-    char **mdbVars = NULL;
-    char **mdbVarLabels = NULL;
-    int count = metaDbVars(conn, &mdbVars,&mdbVarLabels);
+count = metaDbVars(conn, &mdbVars,&mdbVarLabels);
 
     hPrintf("<tr><td colspan='%d' align='right' class='lineOnTop' style='height:20px; max-height:20px;'><em style='color:%s; width:200px;'>ENCODE terms</em></td></tr>", cols,COLOR_DARKGREY);
     for(i = 0; i < numMetadataSelects; i++)
@@ -378,7 +377,7 @@
         hPrintf("<span id='helpLink%d'>help</span></td>\n", i + 1);
         hPrintf("</tr>\n");
         }
-    }
+
     hPrintf("<tr><td colspan='%d' align='right' style='height:10px; max-height:10px;'>&nbsp;</td></tr>", cols);
     //hPrintf("<tr><td colspan='%d' align='right' class='lineOnTop' style='height:20px; max-height:20px;'>&nbsp;</td></tr>", cols);
 
@@ -855,7 +854,7 @@
 
 // Metadata selects require careful accounting
 if(metaDbExists)
-    numMetadataSelects = printMdbSelects(conn,cart,metaDbExists,simpleSearch,&mdbVar,&mdbVal,&numMetadataNonEmpty,cols);
+    numMetadataSelects = printMdbSelects(conn, cart, simpleSearch, &mdbVar, &mdbVal, &numMetadataNonEmpty, cols);
 else
     numMetadataSelects = 0;