src/hg/encode/encodeValidate/doEncodeValidate.pl 1.185

1.185 2009/06/26 16:09:18 larrym
fix filename in fileDb.ra so it handles types with spaces
Index: src/hg/encode/encodeValidate/doEncodeValidate.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeValidate/doEncodeValidate.pl,v
retrieving revision 1.184
retrieving revision 1.185
diff -b -B -U 4 -r1.184 -r1.185
--- src/hg/encode/encodeValidate/doEncodeValidate.pl	18 Jun 2009 16:38:16 -0000	1.184
+++ src/hg/encode/encodeValidate/doEncodeValidate.pl	26 Jun 2009 16:09:18 -0000	1.185
@@ -94,9 +94,9 @@
     -quick		Validate only first $quickCount lines of files
     -skipAll            Turn on all "-skip..." options
     -skipAutoCreation   Tells script skip creating the auto-created files (e.g. RawSignal, PlusRawSignal, MinusRawSignal)
                         this can save you a lot of time when you are debugging and re-running the script on large projects
-    -skipOutput         Dont write the various output files
+    -skipOutput         Don't write the various output files
     -skipValidateFiles  Tells script skip the file validation step; to save a lot of time during testing
     -validateDaf	exit after validating DAF file (project-submission-dir is the DAF file name).
     -validateFile	exit after validating file (project-submission-dir is the file name;
                         requires -fileType option as well)
@@ -1749,9 +1749,11 @@
     # Already this is used in 2 places so made it a function,
     # would be better in the DAF except we'd have to go change all the DAFs :(
     my $downloadOnly = isDownloadOnly($view, $daf->{grant}, $daf->{lab}, $daf);
 
-    print FILE_RA "    filename $tableName.$type.gz\n";
+    my $fileType = $type;
+    $fileType =~ s/ //g;
+    print FILE_RA "    filename $tableName.$fileType.gz\n";
     $metadata .= " composite=$compositeTrack";
 
     if($downloadOnly) {
         my $parentTable = $tableName;
@@ -1763,10 +1765,8 @@
         print FILE_RA "    tableName $tableName\n";
         $metadata .= " tableName=$tableName";
     }
     print FILE_RA "    composite $compositeTrack\n";
-    my $fileType = $type;
-    $fileType =~ s/ //g;
     $metadata .= " fileName=$tableName.$fileType.gz";
 
     print LOADER_RA "tablename $tableName\n";
     print LOADER_RA "view $view\n";