b176f6fdddccf6767ae4ee555e913643b6763888
angie
  Wed Mar 28 15:15:53 2012 -0700
bugfix for #6152: was skipping the bin column twice, oops.
diff --git src/hg/lib/annoStreamDb.c src/hg/lib/annoStreamDb.c
index f0fa554..9a5adf5 100644
--- src/hg/lib/annoStreamDb.c
+++ src/hg/lib/annoStreamDb.c
@@ -79,33 +79,33 @@
     // This is necessary only if we're using sqlStoreResult in asdDoQuery, harmless otherwise:
     return NULL;
 char **row = nextRowUnfiltered(self);
 if (row == NULL)
     return NULL;
 // Skip past any left-join failures until we get a right-join failure, a passing row, or EOF.
 boolean rightFail = FALSE;
 while (annoFilterRowFails(vSelf->filters, row, self->numCols, &rightFail))
     {
     if (rightFail)
 	break;
     row = nextRowUnfiltered(self);
     if (row == NULL)
 	return NULL;
     }
-char *chrom = row[self->omitBin+self->chromIx];
-uint chromStart = sqlUnsigned(row[self->omitBin+self->startIx]);
-uint chromEnd = sqlUnsigned(row[self->omitBin+self->endIx]);
+char *chrom = row[self->chromIx];
+uint chromStart = sqlUnsigned(row[self->startIx]);
+uint chromEnd = sqlUnsigned(row[self->endIx]);
 return annoRowFromStringArray(chrom, chromStart, chromEnd, rightFail, row, self->numCols);
 }
 
 static void asdClose(struct annoStreamer **pVSelf)
 /* Close db connection and free self. */
 {
 if (pVSelf == NULL)
     return;
 struct annoStreamDb *self = *(struct annoStreamDb **)pVSelf;
 // Let the caller close conn; it might be from a cache.
 freeMem(self->table);
 sqlFreeResult(&(self->sr));
 hFreeConn(&(self->conn));
 annoStreamerFree(pVSelf);
 }