src/hg/utils/automation/Encode.pm 1.45

1.45 2009/09/21 18:19:01 tdreszer
New order of the day. DAFs must have dafVersion 1.1
Index: src/hg/utils/automation/Encode.pm
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/utils/automation/Encode.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -b -B -U 4 -r1.44 -r1.45
--- src/hg/utils/automation/Encode.pm	10 Aug 2009 18:44:09 -0000	1.44
+++ src/hg/utils/automation/Encode.pm	21 Sep 2009 18:19:01 -0000	1.45
@@ -24,10 +24,10 @@
 our $unloadFile = "unload.ra";
 our $trackFile = "trackDb.ra";
 our $fileDbFile = "fileDb.ra";
 our $pushQFile = "pushQ.sql";
-our $dafVersion = "1.0";
-our $dafPrevVersion = "0.2.2";
+our $dafVersion = "1.1";
+#our $dafPrevVersion = "0.2.2";
 
 our $fieldConfigFile = "fields.ra";
 our $vocabConfigFile = "cv.ra";
 our $labsConfigFile = "labs.ra";
@@ -296,9 +296,10 @@
     # Validate fields
     my @tmp = grep(!/^TRACKS$/, keys %daf);
     my @errors = validateFieldList(\@tmp, $fields, 'dafHeader');
 
-    if($daf{dafVersion} ne $dafVersion && $daf{dafVersion} ne $dafPrevVersion) {
+    #if($daf{dafVersion} ne $dafVersion && $daf{dafVersion} ne $dafPrevVersion) {
+    if($daf{dafVersion} ne $dafVersion) {
         push(@errors, "dafVersion '$daf{dafVersion}' does not match current version: $dafVersion");
     }
     if(!keys(%{$daf{TRACKS}})) {
         push(@errors, "no views defined for project \'$daf{project}\' in DAF '$dafFile'");