X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=padding.c;h=19b95a9fff07a81759343ee165c2abd3f2d4a0e3;hb=e3bb71f3f845ccf3668d9ce63277b8d8324d42c3;hp=9f8bca7e0fe13992aba557b176090936a34cb34a;hpb=dc39f05a341901dc9dd1ad0a8b6dad8b48c12967;p=samtools.git

diff --git a/padding.c b/padding.c
index 9f8bca7..19b95a9 100644
--- a/padding.c
+++ b/padding.c
@@ -69,6 +69,51 @@ static void unpad_seq(bam1_t *b, kstring_t *s)
 	assert(length == s->l);
 }
 
+int load_unpadded_ref(faidx_t *fai, char *ref_name, int ref_len, kstring_t *seq)
+{
+	char base;
+	char *fai_ref = 0;
+	int fai_ref_len = 0, k;
+
+	fai_ref = fai_fetch(fai, ref_name, &fai_ref_len);
+	if (fai_ref_len != ref_len) {
+		fprintf(stderr, "[depad] ERROR: FASTA sequence %s length %i, expected %i\n", ref_name, fai_ref_len, ref_len);
+		free(fai_ref);
+		return -1;
+	}
+	ks_resize(seq, ref_len);
+	seq->l = 0;
+	for (k = 0; k < ref_len; ++k) {
+		base = fai_ref[k];
+		if (base == '-' || base == '*') {
+			// Map gaps to null to match unpad_seq function
+			seq->s[seq->l++] = 0;
+		} else {
+			int i = bam_nt16_table[(int)base];
+			if (i == 0 || i==16) { // Equals maps to 0, anything unexpected to 16
+				fprintf(stderr, "[depad] ERROR: Invalid character %c (ASCII %i) in FASTA sequence %s\n", base, (int)base, ref_name);
+				free(fai_ref);
+				return -1;
+			}
+			seq->s[seq->l++] = i;
+		}
+	}
+	assert(ref_len == seq->l);
+	free(fai_ref);
+	return 0;
+}
+
+inline int * update_posmap(int *posmap, kstring_t ref)
+{
+	int i, k;
+	posmap = realloc(posmap, ref.m * sizeof(int));
+	for (i = k = 0; i < ref.l; ++i) {
+		posmap[i] = k;
+		if (ref.s[i]) ++k;
+	}
+	return posmap;
+}
+
 int bam_pad2unpad(samfile_t *in, samfile_t *out, faidx_t *fai)
 {
 	bam_header_t *h;
@@ -86,30 +131,46 @@ int bam_pad2unpad(samfile_t *in, samfile_t *out, faidx_t *fai)
 		uint32_t *cigar = bam1_cigar(b);
 		n2 = 0;
 		if (b->core.pos == 0 && b->core.tid >= 0 && strcmp(bam1_qname(b), h->target_name[b->core.tid]) == 0) {
-			int i, k;
-			/*
-			fprintf(stderr, "[depad] Found embedded reference %s\n", bam1_qname(b));
-			*/
+			// fprintf(stderr, "[depad] Found embedded reference %s\n", bam1_qname(b));
 			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;
 			}
+			if (fai) {
+				// Check the embedded reference matches the FASTA file
+				if (load_unpadded_ref(fai, h->target_name[b->core.tid], h->target_len[b->core.tid], &q)) return -1;
+				assert(r.l == q.l);
+				int i;
+				for (i = 0; i < r.l; ++i) {
+					if (r.s[i] != q.s[i]) {
+						// Show gaps as ASCII 45
+						fprintf(stderr, "[depad] ERROR: Embedded sequence and reference FASTA don't match for %s base %i, '%c' vs '%c'\n",
+							h->target_name[b->core.tid], i+1,
+							r.s[i] ? bam_nt16_rev_table[r.s[i]] : 45,
+							q.s[i] ? bam_nt16_rev_table[q.s[i]] : 45);
+						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));
-			for (i = k = 0; i < r.l; ++i) {
-				posmap[i] = k;
-				if (r.s[i]) ++k;
-			}
+			posmap = update_posmap(posmap, r);
 		} else if (b->core.n_cigar > 0) {
 			int i, k, op;
 			if (b->core.tid < 0) {
 				fprintf(stderr, "[depad] ERROR: Read %s has CIGAR but no RNAME\n", bam1_qname(b));
 				return -1;
-			} else if (b->core.tid != r_tid) {
-				fprintf(stderr, "[depad] ERROR: Missing %s embedded reference sequence\n", h->target_name[b->core.tid]);
+			} else if (b->core.tid == r_tid) {
+				; // good case, reference available
+			} else if (fai) {
+				if (load_unpadded_ref(fai, h->target_name[b->core.tid], h->target_len[b->core.tid], &r)) return -1;
+				posmap = update_posmap(posmap, r);
+				r_tid = b->core.tid;
+				// fprintf(stderr, "[depad] Loaded %s from FASTA file\n", h->target_name[b->core.tid]);
+			} else {				
+				fprintf(stderr, "[depad] ERROR: Missing %s embedded reference sequence (and no FASTA file)\n", h->target_name[b->core.tid]);
 				return -1;
 			}
 			unpad_seq(b, &q);
@@ -186,7 +247,7 @@ static int usage(int is_long_help);
 int main_pad2unpad(int argc, char *argv[])
 {
 	samfile_t *in = 0, *out = 0;
-	faidx_t *fai;
+	faidx_t *fai = 0;
 	int c, is_bamin = 1, compress_level = -1, is_bamout = 1, is_long_help = 0;
 	char in_mode[5], out_mode[5], *fn_out = 0, *fn_list = 0, *fn_ref = 0;
         int ret=0;