X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=padding.c;h=033a7916237f94314bcf9661880a3fcde4604156;hb=af97a7bdff4f0d3fec9543ce8077902f8d263ba0;hp=6c8b31ff3de5d01afa79bb94428bd4e711078116;hpb=19657fe4e35bf36016fd2137cff46ba15959d76d;p=samtools.git

diff --git a/padding.c b/padding.c
index 6c8b31f..033a791 100644
--- a/padding.c
+++ b/padding.c
@@ -38,10 +38,11 @@ static void unpad_seq(bam1_t *b, kstring_t *s)
 		op = bam_cigar_op(cigar[k]);
 		ol = bam_cigar_oplen(cigar[k]);
 		if (op == BAM_CMATCH || op == BAM_CEQUAL || op == BAM_CDIFF) {
-			for (i = 0; i < ol; ++i) s->s[s->l++] = bam1_seqi(seq, j);
-			++j;
+			for (i = 0; i < ol; ++i, ++j) s->s[s->l++] = bam1_seqi(seq, j);
 		} else if (op == BAM_CSOFT_CLIP) {
 			j += ol;
+		} else if (op == BAM_CHARD_CLIP) {
+			/* do nothing */
 		} else if (op == BAM_CDEL || op == BAM_CPAD) {
 			for (i = 0; i < ol; ++i) s->s[s->l++] = 0;
                 } else {
@@ -56,7 +57,7 @@ int bam_pad2unpad(bamFile in, bamFile out)
 	bam_header_t *h;
 	bam1_t *b;
 	kstring_t r, q;
-        int r_tid = -1;
+	int r_tid = -1;
 	uint32_t *cigar2 = 0;
 	int n2 = 0, m2 = 0, *posmap = 0;
 
@@ -75,6 +76,10 @@ int bam_pad2unpad(bamFile in, bamFile out)
 			*/
 			r_tid = b->core.tid;
 			unpad_seq(b, &r);
+			if (h->target_len[r_tid] != r.l) {
+				fprintf(stderr, "[depad] ERROR: (Padded) length of %s is %i in BAM header, but %ld in embedded reference\n", bam1_qname(b), h->target_len[r_tid], r.l);
+				return -1;
+			}
 			write_cigar(cigar2, n2, m2, bam_cigar_gen(b->core.l_qseq, BAM_CMATCH));
 			replace_cigar(b, n2, cigar2);
 			posmap = realloc(posmap, r.m * sizeof(int));
@@ -93,6 +98,15 @@ int bam_pad2unpad(bamFile in, bamFile out)
 			}
 			unpad_seq(b, &q);
 			if (bam_cigar_op(cigar[0]) == BAM_CSOFT_CLIP) write_cigar(cigar2, n2, m2, cigar[0]);
+			if (bam_cigar_op(cigar[0]) == BAM_CHARD_CLIP) {
+				write_cigar(cigar2, n2, m2, cigar[0]);
+				if (b->core.n_cigar > 2 && bam_cigar_op(cigar[1]) == BAM_CSOFT_CLIP) {
+					write_cigar(cigar2, n2, m2, cigar[1]);
+				}
+			}
+			/* Include any pads if starts with an insert */
+			for (k = 0; k+1 < b->core.pos && !r.s[b->core.pos - k - 1]; ++k);
+			if (k) write_cigar(cigar2, n2, m2, bam_cigar_gen(k, BAM_CPAD));
 			/* Determine CIGAR operator for each base in the aligned read */
 			for (i = 0, k = b->core.pos; i < q.l; ++i, ++k)
 				q.s[i] = q.s[i]? (r.s[k]? BAM_CMATCH : BAM_CINS) : (r.s[k]? BAM_CDEL : BAM_CPAD);
@@ -105,6 +119,12 @@ int bam_pad2unpad(bamFile in, bamFile out)
 			}
 			write_cigar(cigar2, n2, m2, bam_cigar_gen(k, op));
 			if (bam_cigar_op(cigar[b->core.n_cigar-1]) == BAM_CSOFT_CLIP) write_cigar(cigar2, n2, m2, cigar[b->core.n_cigar-1]);
+                        if (bam_cigar_op(cigar[b->core.n_cigar-1]) == BAM_CHARD_CLIP) {
+				if (b->core.n_cigar > 2 && bam_cigar_op(cigar[b->core.n_cigar-2]) == BAM_CSOFT_CLIP) {
+					write_cigar(cigar2, n2, m2, cigar[b->core.n_cigar-2]);
+			  	}
+				write_cigar(cigar2, n2, m2, cigar[b->core.n_cigar-1]);
+			}
 			/* Remove redundant P operators between M operators, e.g. 5M2P10M -> 15M */
 			for (i = 2; i < n2; ++i)
 				if (bam_cigar_op(cigar2[i]) == BAM_CMATCH && bam_cigar_op(cigar2[i-1]) == BAM_CPAD && bam_cigar_op(cigar2[i-2]) == BAM_CMATCH)