4bfc83ad307e5017054b4852d17dc0b82f1997c5
angie
  Wed Sep 22 17:53:41 2021 -0700
Better formatting of date mismatches for reporting to labs.

diff --git src/hg/utils/otto/sarscov2phylo/gbMetadataAddBioSample.pl src/hg/utils/otto/sarscov2phylo/gbMetadataAddBioSample.pl
index e2c7b35..4e0fc6a 100755
--- src/hg/utils/otto/sarscov2phylo/gbMetadataAddBioSample.pl
+++ src/hg/utils/otto/sarscov2phylo/gbMetadataAddBioSample.pl
@@ -51,32 +51,32 @@
   $b2Date{$bAcc} = $date;
   $b2Country{$bAcc} = $country;
 }
 close($BIOSAMPLE);
 
 my $missingCount = 0;
 while (<>) {
   my ($gbAcc, $bAcc, $gbDate, $gbGeo, $host, $gbName, $completeness, $len) = split("\t");
   if ($bAcc) {
     if (exists $b2Name{$bAcc}) {
       my ($bName, $bDate, $bCountry) = ($b2Name{$bAcc}, normalizeDate($b2Date{$bAcc}),
                                         $b2Country{$bAcc});
       if (! $gbDate || length($bDate) > length($gbDate)) {
         $gbDate = $bDate;
       } elsif ($bDate && $gbDate ne $bDate) {
-        print STDERR "CONFLICT: Genbank date ($gbAcc $gbName) = $gbDate, " .
-          "BioSample date ($bAcc $bName) = $bDate\n";
+        print STDERR join("\t", "dateMismatch", $gbAcc, $gbName, $gbDate, $bAcc, $bName, $bDate) .
+          "\n";
       }
       if (! $gbName) {
         $gbName = $bName;
       } elsif (($gbName eq '1' || $gbName eq 'NA') && length($bName) > length($gbName)) {
         $gbName = $bName;
       } elsif ($gbName eq 'nasopharyngeal' && $bName =~ m/\d/) {
         $gbName = $bName;
       }
       if (! $gbGeo) {
         $gbGeo = $bCountry;
       }
       print join("\t", $gbAcc, $bAcc, $gbDate, $gbGeo, $host, $gbName, $completeness, $len);
     } else {
       # BioSample file doesn't have info for this BioSample accession
       print STDERR "Missing BioSample info for $bAcc\n";