47e0208dfc2fc4eba1994d81c1276f8092e6ce2d
tdreszer
  Thu Mar 24 13:54:35 2011 -0700
Renamed a bunch of mdbCv APIs to cv APIs.
diff --git src/hg/lib/searchTracks.c src/hg/lib/searchTracks.c
index 37e7ac4..1573f91 100644
--- src/hg/lib/searchTracks.c
+++ src/hg/lib/searchTracks.c
@@ -68,31 +68,31 @@
 // returns an allocated string of HTML for the fileType select drop down
 {
 struct slPair *fileTypes = fileFormatSearchWhiteList();
 if (slCount(fileTypes) > 0)
     {
     char *dropDownHtml = cgiMakeSingleSelectDropList(name,fileTypes,selected,ANYLABEL,NULL,extraHtml);
     slPairFreeList(&fileTypes);
     return dropDownHtml;
     }
 return NULL;
 }
 
 struct slPair *mdbVarsRelevant(struct sqlConnection *conn)
 // returns a white list of mdb vars that are relevant to the currect DB
 {
-struct slPair *cvApproved = mdbCvWhiteList(TRUE,FALSE);
+struct slPair *cvApproved = cvWhiteList(TRUE,FALSE);
 struct slPair *relevant = NULL;
 while(cvApproved != NULL)
     {
     struct slPair *oneVar = slPopHead(&cvApproved);
     char query[256];
     safef(query, sizeof(query), "select count(*) from metaDb where var = '%s'",oneVar->name);
     if(sqlQuickNum(conn,query) > 0)
         slAddHead(&relevant, oneVar);
     else
         slPairFree(&oneVar);
     }
 slReverse(&relevant);
 return relevant;
 }
 
@@ -139,44 +139,44 @@
             offset = 2;
         else
             offset = 1;
         safef(buf, sizeof(buf), "%s%d", METADATA_NAME_PREFIX, ix + offset);
         char *var = cartOptionalString(cart, buf);
         char *val = NULL;
 
         if(selectedTab!=simpleTab)
             {
             // We need to make sure var is valid in this assembly; if it isn't, reset it to "cell".
             if(slPairFindVal(mdbVars,var) == NULL)
                 var = "cell";
             else
                 {
                 safef(buf, sizeof(buf), "%s%d", METADATA_VALUE_PREFIX, ix + offset);
-                enum mdbCvSearchable searchBy = mdbCvSearchMethod(var);
-                if (searchBy == cvsSearchByMultiSelect)
+                enum cvSearchable searchBy = cvSearchMethod(var);
+                if (searchBy == cvSearchByMultiSelect)
                     {
                     // Multi-selects as comma delimited list of values
                     struct slName *vals = cartOptionalSlNameList(cart,buf);
                     if (vals)
                         {
                         val = slNameListToString(vals,','); // A comma delimited list of values
                         slNameFreeList(&vals);
                         }
                     }
-                else if (searchBy == cvsSearchBySingleSelect || searchBy == cvsSearchByFreeText)
+                else if (searchBy == cvSearchBySingleSelect || searchBy == cvSearchByFreeText)
                     val = cloneString(cartUsualString(cart, buf,ANYLABEL));
-                //else if (searchBy == cvsSearchByDateRange || searchBy == cvsSearchByIntegerRange)
+                //else if (searchBy == cvSearchByDateRange || searchBy == cvSearchByIntegerRange)
                 //    {
                 //    // TO BE IMPLEMENTED
                 //    }
 
                 if (val != NULL && sameString(val, ANYLABEL))
                     val = NULL;
                 }
             }
         slPairAdd(&mdbSelectPairs,var,val); // val already cloned
         }
     if(delSearchSelect > 0)
         {
         safef(buf, sizeof(buf), "%s%d", METADATA_NAME_PREFIX, numMetadataSelects + 1);
         cartRemove(cart, buf);
         safef(buf, sizeof(buf), "%s%d", METADATA_VALUE_PREFIX, numMetadataSelects + 1);
@@ -221,52 +221,52 @@
     ADD_PM_BUTTON("plus", row, '+');
 
     dyStringAppend(output,"</td><td>and&nbsp;</td><td colspan=3 nowrap>\n");
     safef(buf, sizeof(buf), "%s%i", METADATA_NAME_PREFIX, row);
 
     // Left side select of vars
     dropDownHtml = cgiMakeSingleSelectDropList(buf, mdbVars,mdbSelect->name, NULL,"mdbVar","style='font-size:.9em;' onchange='findTracksMdbVarChanged(this);'");
     if (dropDownHtml)
         {
         dyStringAppend(output,dropDownHtml);
         freeMem(dropDownHtml);
         }
 
     // Right side select of vals
     safef(buf, sizeof(buf), "%s%i", METADATA_VALUE_PREFIX, row);
-    enum mdbCvSearchable searchBy = mdbCvSearchMethod(mdbSelect->name);
-    if (searchBy == cvsSearchBySingleSelect || searchBy == cvsSearchByMultiSelect)
+    enum cvSearchable searchBy = cvSearchMethod(mdbSelect->name);
+    if (searchBy == cvSearchBySingleSelect || searchBy == cvSearchByMultiSelect)
         {
         dyStringPrintf(output,"</td>\n<td align='right' id='isLike%i' style='width:10px; white-space:nowrap;'>is%s</td>\n<td nowrap id='%s' style='max-width:600px;'>\n",
-                row,(searchBy == cvsSearchByMultiSelect?" among":""),buf);
+                row,(searchBy == cvSearchByMultiSelect?" among":""),buf);
         struct slPair *pairs = mdbValLabelSearch(conn, mdbSelect->name, MDB_VAL_STD_TRUNCATION, FALSE, TRUE, FALSE); // not tags, yes tables, not files
         if (slCount(pairs) > 0)
             {
-            char *dropDownHtml = cgiMakeSelectDropList((searchBy == cvsSearchByMultiSelect),
+            char *dropDownHtml = cgiMakeSelectDropList((searchBy == cvSearchByMultiSelect),
                     buf, pairs,mdbSelect->val, ANYLABEL,"mdbVal","style='min-width:200px; font-size:.9em;' onchange='findTracksMdbValChanged(this);'");
             if (dropDownHtml)
                 {
                 dyStringAppend(output,dropDownHtml);
                 freeMem(dropDownHtml);
                 }
             slPairFreeList(&pairs);
             }
         }
-    else if (searchBy == cvsSearchByFreeText)
+    else if (searchBy == cvSearchByFreeText)
         {
         dyStringPrintf(output,"</td><td align='right' id='isLike%i' style='width:10px; white-space:nowrap;'>contains</td>\n<td nowrap id='%s' style='max-width:600px;'>\n",row,buf);
         dyStringPrintf(output,"<input type='text' name='%s' value='%s' class='mdbVal freeText' style='max-width:310px; width:310px; font-size:.9em;' onchange='findTracksMdbVarChanged(true);'>\n",
                 buf,(mdbSelect->val ? (char *)mdbSelect->val: ""));
         }
-    //else if (searchBy == cvsSearchByDateRange || searchBy == cvsSearchByIntegerRange)
+    //else if (searchBy == cvSearchByDateRange || searchBy == cvSearchByIntegerRange)
     //    {
     //    // TO BE IMPLEMENTED
     //    }
     dyStringPrintf(output,"<span id='helpLink%i'>&nbsp;</span></td>\n", row);
     dyStringPrintf(output,"</tr>\n");
     }
 
     dyStringPrintf(output,"<tr><td colspan='%d' align='right' style='height:10px; max-height:10px;'>&nbsp;</td></tr>", cols);
 
 return dyStringCannibalize(&output);
 }