src/hg/encode/encodeValidate/doEncodeValidate.pl 1.213
1.213 2010/01/12 01:08:03 kate
Expand support for versioning. 1. Add V? to metadata column in projects table. 2. Add versioning comment -- newly required field (dataVersionComment) in DAF
Index: src/hg/encode/encodeValidate/doEncodeValidate.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeValidate/doEncodeValidate.pl,v
retrieving revision 1.212
retrieving revision 1.213
diff -b -B -U 4 -r1.212 -r1.213
--- src/hg/encode/encodeValidate/doEncodeValidate.pl 8 Jan 2010 22:11:25 -0000 1.212
+++ src/hg/encode/encodeValidate/doEncodeValidate.pl 12 Jan 2010 01:08:03 -0000 1.213
@@ -1436,8 +1436,11 @@
if (defined(ddfKey(\%line, \%ddfHeader, $daf, 1))) {
$ddfSets{ddfKey(\%line, \%ddfHeader, $daf, 0)}{VIEWS}{$view} = \%line;
$ddfReplicateSets{ddfKey(\%line, \%ddfHeader, $daf, 1)}{VIEWS}{$view} = \%line;
my $str = join(", ", map($line{$_}, sort(@variables)));
+ if (defined($daf->{dataVersion}) && $daf->{dataVersion} > 1) {
+ $str .= ", V" . $daf->{dataVersion};
+ }
$metadataHash{$str} = 1;
}
}
push(@ddfLines, \%line);
@@ -1652,9 +1655,12 @@
$metadata .= ' dataVersion="' . $Encode::dataVersion .'"';
if($submitDir =~ /(\d+)$/) {
$metadata .= " subId=$1";
}
- $metadata .= " submittedDataVersion=V$daf->{dataVersion}" if(defined($daf->{dataVersion}) && $daf->{dataVersion} > 1);
+ if (defined($daf->{dataVersion}) && $daf->{dataVersion} > 1) {
+ die "Need dataVersionComment in DAF when dataVersion is supplied\n" if (!defined($daf->{dataVersionComment}));
+ $metadata .= ' submittedDataVersion="' . "V$daf->{dataVersion}" . " - $daf->{dataVersionComment}" . '"';
+ }
HgAutomate::verbose(2, " View: $view\n");
my $replicate;
if($hasReplicates && $daf->{TRACKS}{$view}{hasReplicates}) {