diff --git a/java/src/org/broadinstitute/sting/gatk/iterators/ReferenceIterator.java b/java/src/org/broadinstitute/sting/gatk/iterators/ReferenceIterator.java index 520055c29..7f0b7a42e 100755 --- a/java/src/org/broadinstitute/sting/gatk/iterators/ReferenceIterator.java +++ b/java/src/org/broadinstitute/sting/gatk/iterators/ReferenceIterator.java @@ -125,8 +125,8 @@ public class ReferenceIterator implements Iterator { // we're somewhere on this contig if ( seekOffset < offset ) { // bad boy -- can't go backward safely - throw new IllegalArgumentException(String.format("Invalid seek to %s from %s, which is usually due to out of order reads%n", - new GenomeLoc(currentContig.getName(), seekOffset), new GenomeLoc(currentContig.getName(), offset))); + throw new IllegalArgumentException(String.format("Invalid seek %s => %s, which is usually due to out of order reads%n", + new GenomeLoc(currentContig.getName(), offset), new GenomeLoc(currentContig.getName(), seekOffset))); } else if ( seekOffset >= currentContig.length() ) { // bad boy -- can't go beyond the contig length @@ -154,8 +154,8 @@ public class ReferenceIterator implements Iterator { if ( cmpContigs == -1 && false ) { // todo: fixed // The contig we are looking for is before the currentContig -- it's an error - throw new IllegalArgumentException(String.format("Invalid seek to %s from %s, which is usually due to out of order reads%n", - new GenomeLoc(currentContig.getName(), seekOffset), new GenomeLoc(currentContig.getName(), offset))); + throw new IllegalArgumentException(String.format("Invalid seek %s => %s, which is usually due to out of order reads%n", + new GenomeLoc(currentContig.getName(), offset), new GenomeLoc(currentContig.getName(), seekOffset))); } else if ( cmpContigs == 1 ) { // we need to jump forward @@ -163,8 +163,8 @@ public class ReferenceIterator implements Iterator { if ( ! refFile.seekToContig(seekContigName) ) { // ok, do the seek // a false result indicates a failure, throw a somewhat cryptic call - throw new RuntimeIOException(String.format("Unexpected seek failure from %s from %s%n", - new GenomeLoc(currentContig.getName(), seekOffset), new GenomeLoc(currentContig.getName(), offset))); + throw new RuntimeIOException(String.format("Unexpected seek failure from %s to %s%n", + new GenomeLoc(currentContig.getName(), offset), new GenomeLoc(currentContig.getName(), seekOffset))); } readNextContig(); // since we haven't failed, we just read in the next contig (which is seekContigName) diff --git a/java/src/org/broadinstitute/sting/gatk/iterators/SamQueryIterator.java b/java/src/org/broadinstitute/sting/gatk/iterators/SamQueryIterator.java index 1fb631d8c..9697f68be 100755 --- a/java/src/org/broadinstitute/sting/gatk/iterators/SamQueryIterator.java +++ b/java/src/org/broadinstitute/sting/gatk/iterators/SamQueryIterator.java @@ -75,6 +75,8 @@ public class SamQueryIterator implements Iterator { (int)currentLoc.getStop() ); if( recordIter.hasNext() ) break; + else + recordIter.close(); } } diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java index cb0a15b7d..65bd27e08 100755 --- a/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java +++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java @@ -345,11 +345,11 @@ public abstract class TraversalEngine { logger.fatal("Couldn't open file in sam file list: " + readsFile); } } - if (samReader.hasIndex()) { - return new SamQueryIterator(samReader, locs); - } else { - return samReader.iterator(); - } + //if (samReader.hasIndex()) { + // return new SamQueryIterator(samReader, locs); + //} else { + return samReader.iterator(); + //} } protected Iterator WrapReadsIterator( final Iterator rawIterator, final boolean enableVerification ) { diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/CountReadsWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/CountReadsWalker.java index e9ff89fe2..c88d25dcf 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/CountReadsWalker.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/CountReadsWalker.java @@ -5,6 +5,7 @@ import org.broadinstitute.sting.gatk.LocusContext; public class CountReadsWalker extends ReadWalker { public Integer map(LocusContext context, SAMRecord read) { + //System.out.println(read.format()); return 1; }