7126fc6ed758f7e4fd3fae9c94de6cf62c9850dc tdreszer Tue Feb 22 13:46:42 2011 -0800 Always print composite summary msg in mdbObjsEncodeExperimentify() diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c index 0a12f41..0f3f2f3 100644 --- src/hg/lib/mdb.c +++ src/hg/lib/mdb.c @@ -2508,31 +2508,30 @@ // Sort all objects by composite, so that we handle composite by composite mdbObjsSortOnVars(&mdbObjs, COMPOSITE_VAR); struct dyString *dyVars = dyStringNew(256); while(mdbObjs != NULL) { // Work on a composite at a time char *compName = NULL; while(mdbObjs != NULL && compName == NULL) { compName = mdbObjFindValue(mdbObjs,COMPOSITE_VAR); if (compName == NULL) { verbose(1, "Object '%s' has no %s defined.\n",mdbObjs->obj,COMPOSITE_VAR); - //return 0; mdbProcessedObs = slCat(mdbProcessedObs,slPopHead(&mdbObjs)); continue; } } struct mdbObj *mdbCompositeObjs = mdbObjsFilter(&mdbObjs, COMPOSITE_VAR, compName,TRUE); // --- At this point we have nibbled off a composite worth of objects from the full set of objects // Find the composite obj if it exists struct mdbObj *compObj = mdbObjsFilter(&mdbCompositeObjs, "objType", "composite",TRUE); if (compObj == NULL) { dyStringClear(dyVars); dyStringPrintf(dyVars,"composite=%s %s=", compName,EDV_VAR_NAME); struct mdbByVar *mdbByVars = mdbByVarsLineParse(dyStringContents(dyVars)); @@ -2713,31 +2712,31 @@ slAddHead(&mdbUpdateObjs,newObj); } slAddHead(&mdbProcessedObs,obj); } // Done with one experiment if (!foundId && errors > 0) { expMissing++; if (warn > 0) printf(" %s all %d objects are missing an %s.\n",experimentId,objsInExp,EXP_ID_NAME); } } // Done with one composite - if (warn > 0 && expCount > 0) + if (expCount > 0) printf("Composite '%s' has %d recognizable experiment%s with %d missing an %s.\n objects/experiment: min:%d max:%d mean:%lf.\n", compName,expCount,(expCount != 1?"s":""),expMissing,EXP_ID_NAME,expMin,expMax,((double)expObjsCount/expCount)); if (edvSortOrder != NULL) freeMem(edvSortOrder); slNameFreeList(compositeEdvs); } // Done with all composites dyStringFree(&dyVars); *pMdbObjs = mdbProcessedObs; return mdbUpdateObjs; }