@@ -296,10 +296,10 @@ static void mp_write_residue(kstring_t *out, const mp_idx_t *mi, const mp_mapopt
296
296
kfree (0 , str [0 ]);
297
297
}
298
298
299
- void mp_write_paf (kstring_t * s , const mp_idx_t * mi , const mp_bseq1_t * seq , const mp_reg1_t * r , int32_t gff_out )
299
+ void mp_write_paf (kstring_t * s , const mp_idx_t * mi , const mp_mapopt_t * opt , const mp_bseq1_t * seq , const mp_reg1_t * r )
300
300
{
301
301
const mp_ctg_t * ctg ;
302
- if (gff_out ) mp_sprintf_lite (s , "##PAF\t" );
302
+ if (opt -> flag & ( MP_F_GFF | MP_F_GTF ) ) mp_sprintf_lite (s , "##PAF\t" );
303
303
if (r == 0 ) {
304
304
mp_sprintf_lite (s , "%s\t%d\t0\t0\t*\t*\t0\t0\t0\t0\t0\t0\n" , seq -> name , seq -> l_seq );
305
305
return ;
@@ -316,8 +316,10 @@ void mp_write_paf(kstring_t *s, const mp_idx_t *mi, const mp_bseq1_t *seq, const
316
316
for (k = 0 ; k < r -> p -> n_cigar ; ++ k )
317
317
mp_sprintf_lite (s , "%d%c" , r -> p -> cigar [k ]>>4 , NS_CIGAR_STR [r -> p -> cigar [k ]& 0xf ]);
318
318
} else mp_sprintf_lite (s , "%d\t%d\t%d" , r -> chn_sc , r -> chn_sc_ungap , r -> cnt );
319
- mp_sprintf_lite (s , "\t" );
320
- mp_write_cs (s , mi , & seq -> seq [r -> qs ], r );
319
+ if (!(opt -> flag & MP_F_NO_CS )) {
320
+ mp_sprintf_lite (s , "\t" );
321
+ mp_write_cs (s , mi , & seq -> seq [r -> qs ], r );
322
+ }
321
323
mp_sprintf_lite (s , "\n" );
322
324
}
323
325
@@ -416,16 +418,16 @@ void mp_write_output(kstring_t *s, void *km, const mp_idx_t *mi, const mp_bseq1_
416
418
s -> l = 0 ;
417
419
if (r == 0 ) {
418
420
if (opt -> flag & MP_F_SHOW_UNMAP )
419
- mp_write_paf (s , mi , seq , 0 , opt -> flag & MP_F_GFF );
421
+ mp_write_paf (s , mi , opt , seq , 0 );
420
422
} else if (opt -> flag & MP_F_GTF ) {
421
423
if (opt -> flag & (MP_F_SHOW_RESIDUE |MP_F_SHOW_TRANS )) {
422
- mp_write_paf (s , mi , seq , r , opt -> flag & MP_F_GTF );
424
+ mp_write_paf (s , mi , opt , seq , r );
423
425
mp_write_residue (s , mi , opt , seq -> seq , r );
424
426
}
425
427
mp_write_gtf (s , km , mi , seq , r , opt -> gff_prefix , id , seq -> name );
426
428
} else {
427
429
if (!(opt -> flag & MP_F_NO_PAF ))
428
- mp_write_paf (s , mi , seq , r , opt -> flag & MP_F_GFF );
430
+ mp_write_paf (s , mi , opt , seq , r );
429
431
if (opt -> flag & (MP_F_SHOW_RESIDUE |MP_F_SHOW_TRANS ))
430
432
mp_write_residue (s , mi , opt , seq -> seq , r );
431
433
if (opt -> flag & MP_F_GFF )
0 commit comments