src/lib/bwgQuery.c 1.18

Index: src/lib/bwgQuery.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/bwgQuery.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -B -U 4 -r1.17 -r1.18
--- src/lib/bwgQuery.c	9 Feb 2009 02:43:23 -0000	1.17
+++ src/lib/bwgQuery.c	10 Feb 2009 22:09:37 -0000	1.18
@@ -119,115 +119,9 @@
         internalErr();
 	break;
     }
 }
-#ifdef DEBUG
-#endif /* DEBUG */
 
-#ifdef OLD
-struct bbiInterval *bigWigIntervalQuery(struct bbiFile *bwf, char *chrom, bits32 start, bits32 end,
-	struct lm *lm)
-/* Get data for interval.  Return list allocated out of lm. */
-{
-if (bwf->typeSig != bigWigSig)
-   errAbort("Trying to do bigWigIntervalQuery on a non big-wig file.");
-bbiAttachUnzoomedCir(bwf);
-struct bbiInterval *el, *list = NULL;
-struct fileOffsetSize *blockList = bbiOverlappingBlocks(bwf, bwf->unzoomedCir, 
-	chrom, start, end, NULL);
-struct fileOffsetSize *block;
-struct udcFile *udc = bwf->udc;
-boolean isSwapped = bwf->isSwapped;
-float val;
-int i;
-
-// slSort(&blockList, fileOffsetSizeCmp);
-struct fileOffsetSize *mergedBlocks = fileOffsetSizeMerge(blockList);
-for (block = blockList; block != NULL; block = block->next)
-    {
-    udcSeek(udc, block->offset);
-    bits64 endBlock = block->offset + block->size;
-    while (udcTell(udc) < endBlock)
-	{
-	struct bwgSectionHead head;
-	bwgSectionHeadRead(bwf, &head);
-	switch (head.type)
-	    {
-	    case bwgTypeBedGraph:
-		{
-		for (i=0; i<head.itemCount; ++i)
-		    {
-		    bits32 s = udcReadBits32(udc, isSwapped);
-		    bits32 e = udcReadBits32(udc, isSwapped);
-		    udcMustReadOne(udc, val);
-		    if (s < start) s = start;
-		    if (e > end) e = end;
-		    if (s < e)
-			{
-			lmAllocVar(lm, el);
-			el->start = s;
-			el->end = e;
-			el->val = val;
-			slAddHead(&list, el);
-			}
-		    }
-		break;
-		}
-	    case bwgTypeVariableStep:
-		{
-		for (i=0; i<head.itemCount; ++i)
-		    {
-		    bits32 s = udcReadBits32(udc, isSwapped);
-		    bits32 e = s + head.itemSpan;
-		    udcMustReadOne(udc, val);
-		    if (s < start) s = start;
-		    if (e > end) e = end;
-		    if (s < e)
-			{
-			lmAllocVar(lm, el);
-			el->start = s;
-			el->end = e;
-			el->val = val;
-			slAddHead(&list, el);
-			}
-		    }
-		break;
-		}
-	    case bwgTypeFixedStep:
-		{
-		bits32 s = head.start;
-		bits32 e = s + head.itemSpan;
-		for (i=0; i<head.itemCount; ++i)
-		    {
-		    udcMustReadOne(udc, val);
-		    bits32 clippedS = s, clippedE = e;
-		    if (clippedS < start) clippedS = start;
-		    if (clippedE > end) clippedE = end;
-		    if (clippedS < clippedE)
-			{
-			lmAllocVar(lm, el);
-			el->start = clippedS;
-			el->end = clippedE;
-			el->val = val;
-			slAddHead(&list, el);
-			}
-		    s += head.itemStep;
-		    e += head.itemStep;
-		    }
-		break;
-		}
-	    default:
-		internalErr();
-		break;
-	    }
-	}
-    }
-slFreeList(&mergedList);
-slFreeList(&blockList);
-slReverse(&list);
-return list;
-}
-#endif /* OLD */
 
 struct bbiInterval *bigWigIntervalQuery(struct bbiFile *bwf, char *chrom, bits32 start, bits32 end,
 	struct lm *lm)
 /* Get data for interval.  Return list allocated out of lm. */