src/hg/makeDb/hgBedsToBedExps/bToBeCfg.c 1.2

Index: src/hg/makeDb/hgBedsToBedExps/bToBeCfg.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/hgBedsToBedExps/bToBeCfg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/makeDb/hgBedsToBedExps/bToBeCfg.c	26 Nov 2007 00:18:44 -0000	1.1
+++ src/hg/makeDb/hgBedsToBedExps/bToBeCfg.c	8 Mar 2010 23:35:38 -0000	1.2
@@ -18,9 +18,9 @@
 ret->factor = row[0];
 ret->source = row[1];
 ret->sourceId = row[2];
 ret->dataSource = row[3];
-ret->dataType = row[4];
+ret->scoreCol = sqlSigned(row[4]);
 ret->multiplier = sqlFloat(row[5]);
 ret->dataTable = row[6];
 }
 
@@ -34,9 +34,9 @@
 ret->factor = cloneString(row[0]);
 ret->source = cloneString(row[1]);
 ret->sourceId = cloneString(row[2]);
 ret->dataSource = cloneString(row[3]);
-ret->dataType = cloneString(row[4]);
+ret->scoreCol = sqlSigned(row[4]);
 ret->multiplier = sqlFloat(row[5]);
 ret->dataTable = cloneString(row[6]);
 return ret;
 }
@@ -89,9 +89,9 @@
 ret->factor = sqlStringComma(&s);
 ret->source = sqlStringComma(&s);
 ret->sourceId = sqlStringComma(&s);
 ret->dataSource = sqlStringComma(&s);
-ret->dataType = sqlStringComma(&s);
+ret->scoreCol = sqlSignedComma(&s);
 ret->multiplier = sqlFloatComma(&s);
 ret->dataTable = sqlStringComma(&s);
 *pS = s;
 return ret;
@@ -107,9 +107,8 @@
 freeMem(el->factor);
 freeMem(el->source);
 freeMem(el->sourceId);
 freeMem(el->dataSource);
-freeMem(el->dataType);
 freeMem(el->dataTable);
 freez(pEl);
 }
 
@@ -144,11 +143,9 @@
 if (sep == ',') fputc('"',f);
 fprintf(f, "%s", el->dataSource);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
-if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->dataType);
-if (sep == ',') fputc('"',f);
+fprintf(f, "%d", el->scoreCol);
 fputc(sep,f);
 fprintf(f, "%g", el->multiplier);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);