Merge branch 'hotfix/1.8.8'

Reviewed in #33
cancerit · Jun 5, 2019 · d1057d7 · d1057d7
2 parents 71396da + f7f6908
commit d1057d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/bin/cgpFlagCaVEMan.pl b/bin/cgpFlagCaVEMan.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ##########LICENCE##########
-# Copyright (c) 2014-2018 Genome Research Ltd.
+# Copyright (c) 2014-2019 Genome Research Ltd.
 #
 # Author: CASM/Cancer IT <cgphelp@sanger.ac.uk>
 #
@@ -572,8 +572,8 @@ sub runFlagger{
         my $sampleHitCount = 0;
         my $totalSampleCnt = 0;
         foreach my $sampData(@samples){
-          next if($sampData eq ".");
           $totalSampleCnt++;
+          next if($sampData eq q{0:.:.:.:.} || $sampData eq q{-} || $sampData eq q{.});
           #GT:GF:CF:TF:AF	0|0:41:0:0:0
           my ($gentype,@data) = split(':',$sampData);
           my $totalCvg = 0;

diff --git a/bin/convertVCFUnmatchedToBed.pl b/bin/convertVCFUnmatchedToBed.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ############## LICENSE ##############
-# Copyright (c) 2014-2018 Genome Research Ltd.
+# Copyright (c) 2014-2019 Genome Research Ltd.
 #
 # Author: CASM/Cancer IT <cgphelp@sanger.ac.uk>
 #
@@ -106,7 +106,7 @@
 
     for my $i(9..$max_col) {
       $sample_count++;
-      next if($x[$i] =~m/^[.\-]$/);
+      next if($x[$i] eq '0:.:.:.:.' || $x[$i] =~m/^[.\-]$/);
       my @gts = split /:/, $x[$i];
       for my $j(1..$max_allele) {
         next if($base_list[$j-1] eq $refb);

diff --git a/lib/Sanger/CGP/CavemanPostProcessing.pm b/lib/Sanger/CGP/CavemanPostProcessing.pm
@@ -32,7 +32,7 @@ use Attribute::Abstract;
 use Data::Dumper;
 use base 'Exporter';
 
-our $VERSION = '1.8.7';
+our $VERSION = '1.8.8';
 our @EXPORT = qw($VERSION);
 
 const my $MATCH_CIG => 'M';

diff --git a/lib/Sanger/CGP/CavemanPostProcessing/Flagger.pm b/lib/Sanger/CGP/CavemanPostProcessing/Flagger.pm
@@ -655,8 +655,8 @@ sub getVCFUnmatchedFlag{
   my $sampleHitCount = 0;
   my $totalSampleCnt = 0;
   foreach my $sampData(@samples){
-    next if($sampData eq ".");
     $totalSampleCnt++;
+    next if($sampData eq q{0:.:.:.:.} || $sampData eq q{-} || $sampData eq q{.});
     #GT:GF:CF:TF:AF	0|0:41:0:0:0
     my ($gentype,@data) = split(':',$sampData);
     my $totalCvg = 0;
@@ -769,4 +769,4 @@ sub sameReadPosFlag{
 	return 0;
 }
 
-1;
+1;
diff --git a/lib/Sanger/CGP/CavemanPostProcessor.pm b/lib/Sanger/CGP/CavemanPostProcessor.pm
@@ -32,7 +32,7 @@ use Attribute::Abstract;
 use Data::Dumper;
 use base 'Exporter';
 
-our $VERSION = '1.8.7';
+our $VERSION = '1.8.8';
 our @EXPORT = qw($VERSION);
 
 const my $MATCH_CIG => 'M';