5b231c76037ee3991c7103797aae03b48d3e5ae9 tdreszer Wed Mar 30 12:44:29 2011 -0700 Replaced another couple of literals diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c index 2cee692..6011719 100644 --- src/hg/lib/mdb.c +++ src/hg/lib/mdb.c @@ -2732,31 +2732,31 @@ { verbose(1, "There are no experiment defining variables established for this %s. Add them to obj %s => var:%s.\n", MDB_VAR_COMPOSITE, compName,MDB_VAR_ENCODE_EDVS); mdbProcessedObs = slCat(mdbProcessedObs,mdbCompositeObjs); mdbCompositeObjs = NULL; continue; } dyStringClear(dyVars); dyStringAppend(dyVars,slNameListToString(compositeEdvs, ' ')); if (warn > 0) printf("Composite '%s' with %d objects has %d EDVs(%s): [%s].\n",compName,slCount(mdbCompositeObjs), slCount(compositeEdvs),MDB_VAR_ENCODE_EDVS,dyStringContents(dyVars)); // Set the stage // Organize composite objs by EDVs - dyStringPrintf(dyVars, " view replicate "); // Allows for nicer sorted list + dyStringPrintf(dyVars, " %s %s ",MDB_VAR_VIEW,MDB_VAR_REPLICATE); // Allows for nicer sorted list char *edvSortOrder = cloneString(dyStringContents(dyVars)); // Walk through objs for an exp as defined by EDVs int expCount=0; // Count of experiments in composite int expMissing=0; // Count of experiments with missing expId int expObjsCount=0; // Total of all experimental object accoss the composite int expMax=0; // Largest experiment (in number of objects) int expMin=999; // Smallest experiment (in number of objects) while(mdbCompositeObjs != NULL) { // Must sort each cycle, because sort order is lost during mdbObjs FilterByVars(); mdbObjsSortOnVars(&mdbCompositeObjs, edvSortOrder); // Get the EDVs for the first obj struct mdbVar *edvVarVals = mdbObjEncodeEdvsAsMdbVars(mdbCompositeObjs,compositeEdvs,TRUE); // use first obj on list and include Nones