8f38a6163e61631c363e89b3fd3c5571ea5638b2
tdreszer
  Tue Oct 12 12:18:34 2010 -0700
Too distinctive?  Removed distinct stutter.
diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c
index a58dbbd..55ac8fe 100644
--- src/hg/lib/mdb.c
+++ src/hg/lib/mdb.c
@@ -2044,9 +2044,9 @@
 
 struct dyString *dyQuery = dyStringNew(512);
 if (limit > 0)
-    dyStringPrintf(dyQuery,"select distinct distinct LEFT(val,%d)",limit);
+    dyStringPrintf(dyQuery,"select distinct LEFT(val,%d)",limit);
 else
-    dyStringPrintf(dyQuery,"select distinct distinct val");
+    dyStringPrintf(dyQuery,"select distinct val");
 
 dyStringPrintf(dyQuery," from %s l1 where l1.var='%s' ",tableName,var);
 
@@ -2060,7 +2060,7 @@
 return retVal;
 }
 
-// TODO: decide to make this public or hide it away inside the one finction so far that uses it.
+// TODO: decide to make this public or hide it away inside the one function so far that uses it.
 static struct hash *cvHash = NULL;
 static char *cv_file()
 // return default location of cv.ra
@@ -2074,8 +2074,8 @@
 
 struct slPair *mdbValLabelSearch(struct sqlConnection *conn, char *var, int limit, boolean tables, boolean files)
 // Search the metaDb table for vals by var and returns cv label (if it exists) and val as a pair.
-// Can impose (non-zero) limit on returned string size of name.  Search is via mysql, so it's case-insensitive.
-// Return is sorted on name (label or else val).
+// Can impose (non-zero) limit on returned string size of name.
+// Return is case insensitive sorted on name (label or else val).
 {  // TODO: Change this to use normal mdb struct routines?
 if (!tables && !files)
     errAbort("mdbValSearch requests values for neither table nor file objects.\n");
@@ -2084,9 +2084,9 @@
 
 struct dyString *dyQuery = dyStringNew(512);
 if (limit > 0)
-    dyStringPrintf(dyQuery,"select distinct distinct LEFT(val,%d)",limit);
+    dyStringPrintf(dyQuery,"select distinct LEFT(val,%d)",limit);
 else
-    dyStringPrintf(dyQuery,"select distinct distinct val");
+    dyStringPrintf(dyQuery,"select distinct val");
 
 dyStringPrintf(dyQuery," from %s l1 where l1.var='%s' ",tableName,var);
 
@@ -2095,10 +2095,10 @@
                    tableName,tables?"table":"file");
 dyStringAppend(dyQuery," order by val");
 
+// Establish cv hash
 if (cvHash == NULL)
-    {
     cvHash = raReadAll(cgiUsualString("ra", cv_file()), "term");
-    }
+
 struct slPair *pairs = NULL, *pair;
 struct sqlResult *sr = sqlGetResult(conn, dyStringCannibalize(&dyQuery));
 char **row;
@@ -2121,7 +2121,7 @@
         if (label != NULL)
             {
             freeMem(pair->name);
-            pair->name = strSwapChar(cloneString(label),'_',' ');
+            pair->name = strSwapChar(cloneString(label),'_',' ');  // vestigial _ meaning space
             if (limit > 0 && strlen(pair->name) > limit)
                 pair->name[limit] = '\0';
             }