36b71a06f6f24eb5aaf27f135f6cc0a921f6a059
galt
  Wed Jan 31 13:55:45 2018 -0800
oops, need the rest of the changes for facet field selections

diff --git src/hg/lib/facetField.c src/hg/lib/facetField.c
index 28fd432..41e6ee4 100644
--- src/hg/lib/facetField.c
+++ src/hg/lib/facetField.c
@@ -1,103 +1,175 @@
 
 #include "common.h"
 #include "hash.h"
 #include "linefile.h"
 #include "jksql.h"
 #include "facetField.h"
+#include "csv.h"
 
 static int facetValCmpUseCountDesc(const void *va, const void *vb)
 /* Compare two facetVal so as to sort them based on useCount with most used first */
 {
 struct facetVal *a = *((struct facetVal **)va);
 struct facetVal *b = *((struct facetVal **)vb);
 return b->useCount - a->useCount;
 }
 
 static struct facetVal *facetValNew(char *val, int useCount)
 /* Create new facetVal structure */
 {
 struct facetVal *facetVal;
 AllocVar(facetVal);
 facetVal->val = val;
 facetVal->useCount = useCount;
 return facetVal;
 }
 
-static void facetFieldAdd(struct facetField *facetField, char *tagVal)
+static void facetFieldAdd(struct facetField *facetField, char *tagVal, boolean selecting)
 /* Add information about tag to facetField */
 {
+if (!selecting)
     facetField->useCount += 1;
 struct facetVal *facetVal = hashFindVal(facetField->valHash, tagVal);
 if (facetVal == NULL)
     {
     AllocVar(facetVal);
     hashAddSaveName(facetField->valHash, tagVal, facetVal, &facetVal->val);
     slAddHead(&facetField->valList, facetVal);
+    if (selecting)
+	{
+	facetVal->selected = TRUE;
+	facetField->allSelected = FALSE;
+	}
+    if (facetField->allSelected)
+	facetVal->selected = TRUE;
     }
+if (!selecting)
     facetVal->useCount += 1;
+facetField->currentVal = facetVal;
 }
 
 static struct facetField *facetFieldNew(char *fieldName)
 /* Create a new facetField structure */
 {
 struct facetField *facetField;
 AllocVar(facetField);
 facetField->fieldName = cloneString(fieldName);
 facetField->valHash = hashNew(0);
+facetField->allSelected = TRUE;  // default to all values selected
 return facetField;
 }
 
 struct facetField *facetFieldsFromSqlTable(struct sqlConnection *conn, char *table, char *fields[], int fieldCount, 
-    char *nullVal, char *where)
+    char *nullVal, char *where, char *selectedFields)
 /* Return a list of facetField, one for each field of given table */
 {
+
 /* Make query string */
 struct dyString *query = dyStringNew(0);
 sqlDyStringPrintf(query, "select %s", fields[0]);
 int i;
 for (i=1; i<fieldCount; ++i)
     {
     sqlDyStringPrintf(query, ",");
     sqlDyStringPrintf(query, "%s", fields[i]);
     }
 sqlDyStringPrintf(query, " from %s", table);
 if (where != NULL)
     sqlDyStringPrintf(query, " where %-s", where); // trusting where-clause
 
 /* Create facetField list and table. */
 struct facetField *ffArray[fieldCount], *ffList = NULL, *ff;
 for (i=0; i<fieldCount; ++i)
     {
     ff = ffArray[i] = facetFieldNew(fields[i]);
     slAddHead(&ffList, ff);
     }
 slReverse(&ffList);
 
+/* Initialize selected facet values */
+if (selectedFields)
+    {
+    boolean done = FALSE;
+    while (!done)
+	{
+	if (sameString(selectedFields, ""))
+	    break;
+	char *end = strchr(selectedFields, '\n');
+	if (!end)
+	    {
+	    end = selectedFields + strlen(selectedFields);
+	    done = TRUE;
+	    }
+	*end = 0;
+	char *spc = strchr(selectedFields, ' ');
+	if (!spc)
+	    errAbort("expected space separating fieldname from values");
+	*spc = 0;
+	char *vals = spc+1;
+	if (*vals == 0)
+	    errAbort("expected values after space");
+	struct slName *valList = csvParse(vals);
+
+	for (i=0; i<fieldCount; ++i)
+	    {
+	    if (sameString(ffArray[i]->fieldName, selectedFields))
+		{
+		struct slName *el;
+		for (el=valList; el; el=el->next)
+		    {
+		    uglyf("adding selected field %s val %s\n", selectedFields, el->name);
+		    facetFieldAdd(ffArray[i], el->name, TRUE);
+		    }
+		}
+	    }
+	selectedFields = end+1;
+	}
+    }
+
+
 /* Scan through result saving it in list. */
 struct sqlResult *sr = sqlGetResult(conn, query->string);
 char **row;
 while ((row = sqlNextRow(sr)) != NULL)
     {
+    int totalSelectedFacets = 0;
     for (i=0; i<fieldCount; ++i)
 	{
 	char *val = row[i];
 	if (val == NULL)
 	    val = nullVal;
 	if (val != NULL)
-	    facetFieldAdd(ffArray[i], val);
+	    {
+	    facetFieldAdd(ffArray[i], val, FALSE);
+	    if (ffArray[i]->currentVal->selected)
+		++totalSelectedFacets;
+	    }
 	}
+
+    if (totalSelectedFacets == fieldCount)
+	{
+	// include this row in the final resultset
+	}
+    for (i=0; i<fieldCount; ++i)
+	{
+	// disregard one's self.
+	if ((totalSelectedFacets - (int)ffArray[i]->currentVal->selected) == (fieldCount - 1))
+	    ffArray[i]->currentVal->selectCount++;
+	    // shown on GUI to guide choosing by user
+	}
+
     }
 
 /* Sort lists */
 for (ff = ffList; ff != NULL; ff = ff->next)
     slSort(&ff->valList, facetValCmpUseCountDesc);
 
 /* Clean up and go home */
 dyStringFree(&query);
 sqlFreeResult(&sr);
 return ffList;
 }
 
 struct facetVal *facetValMajorPlusOther(struct facetVal *list, double minRatio)
 /* Return a list of only the tags that are over minRatio of total tags.
  * If there are tags that have smaller amounts than this, lump them together