be799f4fbdb1c21639e440ac519e5808ed640608
tdreszer
  Wed Apr 20 08:58:17 2011 -0700
Temprarily block experimentify from creating expId's in encodeExp table.  Cricket will manage expId creation with Kate's tool for now.  mdbUpdate can still create accessions in encodeExp table when expId already exists.
diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c
index 83f8351..a5e5440 100644
--- src/hg/lib/mdb.c
+++ src/hg/lib/mdb.c
@@ -2816,32 +2816,34 @@
         // Work on one experiment at a time
         verbose(2, "mdbObjsEncodeExperimentify() working on EDVs: %s.\n",dyStringContents(dyVars));
         struct mdbObj *mdbExpObjs = mdbObjsFilterByVars(&mdbCompositeObjs,dyStringContents(dyVars),TRUE,TRUE); // None={notFound}
 
         // --- At this point we have nibbled off an experiment worth of objects from the composite set of objects
 
         int objsInExp = slCount(mdbExpObjs);
         assert(objsInExp > 0);
         expCount++;
         expObjsCount += objsInExp; // Total of all experimental objects across the composite
 
         // Look up each exp in EXPERIMENTS_TABLE
         char experimentId[128];
         int expId = ENCODE_EXP_IX_UNDEFINED;
         struct encodeExp *exp = encodeExpGetByMdbVarsFromTable(db, edvVarVals, expTable);
-        if (exp == NULL && createExpIfNecessary)
-            exp = encodeExpGetOrCreateByMdbVarsFromTable(db, edvVarVals, expTable);
+        // --------- BLOCK creation of expIds, at least during rollout of encodeExp
+        // BLOCKED if (exp == NULL && createExpIfNecessary)
+        // BLOCKED     exp = encodeExpGetOrCreateByMdbVarsFromTable(db, edvVarVals, expTable);
+        // --------- BLOCK creation of expIds, at least during rollout of encodeExp
         mdbVarsFree(&edvVarVals); // No longer needed
 
         // Make sure the accession is set if requested.
         if (createExpIfNecessary && updateAccession
         && exp->ix != ENCODE_EXP_IX_UNDEFINED && exp->accession == NULL)
             encodeExpSetAccession(exp, expTable);
 
         if (exp != NULL)
             expId = exp->ix;
 
         if (expId == ENCODE_EXP_IX_UNDEFINED)
             {
             safef(experimentId,sizeof(experimentId),"{missing}");
             if (warn > 0)
                 printf("Experiment %s EDV: [%s] is not defined in %s.%s table.\n",experimentId,dyStringContents(dyVars), ENCODE_EXP_DATABASE, expTable);