dacec81196967c10d494c7b77a49cc41a5aa63ce kent Thu Jan 28 22:10:56 2021 -0800 Making a couple of more variables use the varPrefix rather than be hard coded. diff --git src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c index 3c7437e..db1072a 100644 --- src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c +++ src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c @@ -1238,45 +1238,45 @@ { 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, "cdwBrowseFiles_facet_op"); if (selOp) { - char *selFieldName = cartOptionalString(cart, "browseFiles_facet_fieldName"); - char *selFieldVal = cartOptionalString(cart, "browseFiles_facet_fieldVal"); + char *selFieldName = cartOptionalString(cart, "cdwBrowseFiles_facet_fieldName"); + char *selFieldVal = cartOptionalString(cart, "cdwBrowseFiles_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, "cdwBrowseFiles_facet_op"); - cartRemove(cart, "browseFiles_facet_fieldName"); - cartRemove(cart, "browseFiles_facet_fieldVal"); + cartRemove(cart, "cdwBrowseFiles_facet_fieldName"); + cartRemove(cart, "cdwBrowseFiles_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", ""); struct hash *wrappers = hashNew(0); hashAdd(wrappers, "file_name", wrapFileName);