src/hg/oneShot/tdbRewriteAddReplaces/tdbRewriteAddReplaces.c 1.2
1.2 2009/12/08 23:39:11 kent
Getting rid of debugging statements.
Index: src/hg/oneShot/tdbRewriteAddReplaces/tdbRewriteAddReplaces.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/oneShot/tdbRewriteAddReplaces/tdbRewriteAddReplaces.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/oneShot/tdbRewriteAddReplaces/tdbRewriteAddReplaces.c 8 Dec 2009 23:38:23 -0000 1.1
+++ src/hg/oneShot/tdbRewriteAddReplaces/tdbRewriteAddReplaces.c 8 Dec 2009 23:39:11 -0000 1.2
@@ -298,10 +298,8 @@
char *findRelease(struct raRecord *record, struct raLevel *level)
/* Find release tag in self or parent track at this level. */
{
-boolean uglyOne = sameString(record->key, "encodeAffyChIpHl60PvalBrg1Hr00");
-if (uglyOne) uglyf("findRelease for %s\n", record->key);
while (record != NULL)
{
struct raTag *releaseTag = raRecordFindTag(record, "release");
if (releaseTag != NULL)
@@ -317,13 +315,10 @@
struct raRecord *findRecordAtLevel(struct raLevel *level, char *key, char *release)
/* Find record of given key and release in level. */
{
-boolean uglyOne = sameString(key, "encodeAffyChIpHl60PvalBrg1Hr00");
-if (uglyOne) uglyf("findRecordAtLevel %s %s %s\n", level->name, key, release);
/* Look up key in hash */
struct hashEl *firstEl = hashLookup(level->trackHash, key);
-if (uglyOne) uglyf("firstEl %p\n", firstEl);
/* Loop through and return any ones that match on both key (implicit in hash find) and
* in release. */
struct hashEl *hel;
@@ -345,53 +340,42 @@
struct raRecord *findRecordInParentFileLevel(struct raLevel *level, struct raRecord *record)
/* Find record matching release in parent file level. */
{
-boolean uglyOne = sameString(record->key, "encodeAffyChIpHl60PvalBrg1Hr00");
-if (uglyOne) uglyf("findRecordInParentFileLevel %s %s\n", level->name, record->key);
char *release = findRelease(record, level);
-if (uglyOne) uglyf("release for %s in %s is %s\n", record->key, record->file->name, release);
struct raRecord *parentRecord = NULL;
struct raLevel *parent;
for (parent = level->parent; parent != NULL; parent = parent->parent)
{
- if (uglyOne) uglyf("parent %s\n", parent->name);
if ((parentRecord = findRecordAtLevel(parent, record->key, release)) != NULL)
break;
}
-if (uglyOne) uglyf(" parentRecord = %p\n", parentRecord);
return parentRecord;
}
void rewriteFile(struct raLevel *level, struct raFile *file, char *outName, struct lm *lm)
/* Rewrite file to outName, consulting symbols in parent. */
{
-uglyf("rewriteFile %s\n", outName);
FILE *f = mustOpen(outName, "w");
struct raRecord *r;
for (r = file->recordList; r != NULL; r = r->next)
{
/* Rewrite leading track tag in stanzas. Other tags pass through. */
struct raTag *t = r->tagList;
if (sameString(t->name, "track"))
{
-boolean uglyOne = sameString(r->key, "encodeAffyChIpHl60PvalBrg1Hr00");
-if (uglyOne) uglyf("got you %s\n", r->key);
char *tagStart = firstTagInText(t->text);
mustWrite(f, t->text, tagStart - t->text);
char *dupeVal = cloneString(t->val);
char *words[8];
int wordCount;
wordCount = chopLine(dupeVal, words);
-if (uglyOne) uglyf("wordCount %d\n", wordCount);
if (wordCount > 2)
recordAbort(r, "too many words in track line");
char *key = words[0];
assert(sameString(key, r->key));
char *mergeOp = (wordCount > 1 ? words[1] : NULL);
-if (uglyOne) uglyf("mergeOp %s\n", mergeOp);
struct raRecord *parentRecord = findRecordInParentFileLevel(level, r);
-if (uglyOne) uglyf("parentRecord %p\n", parentRecord);
if (parentRecord != NULL)
{
if (mergeOp == NULL)
mergeOp = "replace";