f696e3739df240549d0ef2a172a13f7b4d2a8433
kent
  Thu Jan 28 21:26:51 2021 -0800
Making facet_op be not hard coded

diff --git src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c
index 0c026a9..3c7437e 100644
--- src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c
+++ src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c
@@ -33,31 +33,30 @@
 #include "wikiLink.h"
 #include "cdwFlowCharts.h"
 #include "cdwStep.h"
 #include "facetField.h"
 #include "rqlToSql.h"
 
 /* Global vars */
 struct cart *cart;	// User variables saved from click to click
 struct hash *oldVars;	// Previous cart, before current round of CGI vars folded in
 struct cdwUser *user;	// Our logged in user if any
 static char *accessibleFilesToken = NULL;  // Token for file access if any
 boolean isPublicSite = FALSE;
 
 
 char *excludeVars[] = {"cdwCommand", "submit", "DownloadFormat", NULL};
-
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
   "cdwWebBrowse is a cgi script not meant to be run from command line.\n"
   );
 }
 
 void printHash(char *label, struct hash *hash)
 /* Print out keys in hash alphabetically. */
 {
 struct hashEl *list, *el;
 list = hashElListHash(hash);
 slSort(&list, hashElCmp);
 printf("%s:\n", label);
@@ -1236,46 +1235,46 @@
 cgiMakeHiddenVar("clearRestriction", "0");
 char *clearRestriction = cartOptionalString(cart, "clearRestriction");
 if (clearRestriction && sameString(clearRestriction,"1"))
     {
     cartSetString(cart, "cdwFile_filter", "");  // reset file filter to empty string
     cartRemove(cart, "clearRestriction");
     }
 
 // DEBUG REMOVE
 //char *varName = "cdwSelectedFieldValues";
 //char *varVal = cartUsualString(cart, varName, "");
 //warn("varName=[%s] varVal=[%s]", varName, varVal); // DEBUG REMOVE
 
 //warn("getCdwTableSetting(cdwFileFacets)=%s", getCdwTableSetting("cdwFileFacets")); // DEBUG REMOVE
 
-char *selOp = cartOptionalString(cart, "browseFiles_facet_op");
+char *selOp = cartOptionalString(cart, "cdwBrowseFiles_facet_op");
 if (selOp)
     {
     char *selFieldName = cartOptionalString(cart, "browseFiles_facet_fieldName");
     char *selFieldVal = cartOptionalString(cart, "browseFiles_facet_fieldVal");
     if (selFieldName && selFieldVal)
 	{
 	char *selectedFacetValues=cartUsualString(cart, "cdwSelectedFieldValues", "");
 	//warn("selectedFacetValues=[%s] selFieldName=%s selFieldVal=%s selOp=%s", 
 	    //selectedFacetValues, selFieldName, selFieldVal, selOp); // DEBUG REMOVE
 	struct facetField *selList = deLinearizeFacetValString(selectedFacetValues);
 	selectedListFacetValUpdate(&selList, selFieldName, selFieldVal, selOp);
 	char *newSelectedFacetValues = linearizeFacetVals(selList);
 	//warn("newSelectedFacetValues=[%s]", newSelectedFacetValues); // DEBUG REMOVE
 	cartSetString(cart, "cdwSelectedFieldValues", newSelectedFacetValues);
-	cartRemove(cart, "browseFiles_facet_op");
+	cartRemove(cart, "cdwBrowseFiles_facet_op");
 	cartRemove(cart, "browseFiles_facet_fieldName");
 	cartRemove(cart, "browseFiles_facet_fieldVal");
 	}
     }
 
 printf("Click on file's name to see full metadata.");
 printf(" Links in ucsc_db go to the Genome Browser. <BR>\n");
 char *searchString = showSearchControl("cdwFileSearch", "files");
 
 /* Put up big filtered table of files */
 char returnUrl[PATH_LEN*2];
 safef(returnUrl, sizeof(returnUrl), "../cgi-bin/cdwWebBrowse?cdwCommand=browseFiles&%s",
     cartSidUrlString(cart) );
 char *where = cartUsualString(cart, "cdwFile_filter", "");