c3f13e90a8837357a7f4bdf8d07ddfc3ea7ab9b5 galt Sat Oct 30 01:01:38 2021 -0700 CIRM: finished fixing cdwWebBrowse to be compatible with Jims variable name change. diff --git src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c index aff6340..5b25a3d 100644 --- src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c +++ src/hg/cirm/cdw/cdwWebBrowse/cdwWebBrowse.c @@ -1229,51 +1229,51 @@ /* Print list of files */ { printf("
\n"); cartSaveSession(cart); cgiMakeHiddenVar("cdwCommand", "browseFiles"); cgiMakeHiddenVar("clearRestriction", "0"); char *clearRestriction = cartOptionalString(cart, "clearRestriction"); if (clearRestriction && sameString(clearRestriction,"1")) { cartSetString(cart, "cdwBrowseFiles_filter", ""); // reset file filter to empty string cartRemove(cart, "clearRestriction"); } // DEBUG REMOVE -//char *varName = "cdwSelectedFieldValues"; +//char *varName = "cdwBrowseFiles_facet_selList"; //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, "cdwBrowseFiles_facet_fieldName"); char *selFieldVal = cartOptionalString(cart, "cdwBrowseFiles_facet_fieldVal"); if (selFieldName && selFieldVal) { - char *selectedFacetValues=cartUsualString(cart, "cdwSelectedFieldValues", ""); + char *selectedFacetValues=cartUsualString(cart, "cdwBrowseFiles_facet_selList", ""); //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); + cartSetString(cart, "cdwBrowseFiles_facet_selList", newSelectedFacetValues); cartRemove(cart, "cdwBrowseFiles_facet_op"); 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.
\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, "cdwBrowseFiles_filter", "");