a7f306609cce1f61707409f4a789c5e040a9c017 tdreszer Fri Jan 14 15:36:31 2011 -0800 Rearranged the defaulting sort order fields slightly diff --git src/hg/lib/fileUi.c src/hg/lib/fileUi.c index 81e550a..cb5f0e9 100644 --- src/hg/lib/fileUi.c +++ src/hg/lib/fileUi.c @@ -167,36 +167,36 @@ if(setting) { sortOrder = needMem(sizeof(sortOrder_t)); sortOrder->setting = cloneString(setting); carveSetting = sortOrder->setting; } else { if (mdbObjs != NULL) { struct dyString *dySortFields = dyStringNew(512); struct mdbObj *commonVars = mdbObjsCommonVars(mdbObjs); // Problem with making common fieds as sorable is that it REQUIRES a fixed sort order char *sortables[] = {"grant","lab","dataType","cell","strain","age","rnaExtract","localization","phase","treatment","antibody","protocol", "labProtocolId","restrictionEnzyme","control","replicate","expId","labExpId","setType","view","submittedDataVersion","subId", - "dataVersion","dateSubmitted","dateResubmitted","dateUnrestricted",//"labVersion","softwareVersion", - "mapAlgorithm","fragSize","fragLength"}; + "dateSubmitted","dateResubmitted","dateUnrestricted","dataVersion"};//"labVersion","softwareVersion", // Not included: no:not searchable - // accession no, annotation no, bioRep no, composite no, controlId no, dccInternalNotes no, fileIndex no, fileName no, freezeDate no - // geoSample, geoSeries, insertLength no, labVersion, level no, obtainedBy, origAssembly, privacy no, rank no - // readType, seqPlatform, sex, size no, softwareVersion, tableName no, uniqueness no + // accession no, annotation no, bioRep no, composite no, controlId no, dccInternalNotes no, fileIndex no, fileName no, + // fragSize no, fragLength no, freezeDate no, geoSample, geoSeries, insertLength no, labVersion, level no, + // mapAlgorithm, obtainedBy, origAssembly, privacy no, rank no, readType, seqPlatform, sex, + // size no, softwareVersion, tableName no, uniqueness no int ix = 0, count = sizeof(sortables)/sizeof(char *); for (ix=0;ix<count;ix++) { // If sortables[ix] is in common vars then then add it to the settings field if (mdbObjContains(commonVars,sortables[ix],NULL)) dyStringPrintf(dySortFields,"%s=%s ",sortables[ix],strSwapChar(cloneString(cvLabel(sortables[ix])),' ','_')); } if (dyStringLen(dySortFields)) { dyStringAppend(dySortFields,"fileSize=Size fileType=File_Type"); setting = dyStringCannibalize(&dySortFields); } else dyStringFree(&dySortFields);