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

Index: src/hg/encode/encodeValidate/doEncodeValidate.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeValidate/doEncodeValidate.pl,v
retrieving revision 1.152
retrieving revision 1.153
diff -b -B -U 4 -r1.152 -r1.153
--- src/hg/encode/encodeValidate/doEncodeValidate.pl	13 Feb 2009 19:16:08 -0000	1.152
+++ src/hg/encode/encodeValidate/doEncodeValidate.pl	13 Feb 2009 21:59:49 -0000	1.153
@@ -1030,8 +1030,18 @@
 	return undef; # Some dafs have no variables, eg, Sanger Gencode
     }
 }
 
+sub isDownloadOnly {
+    my ($view, $grant, $lab) = @_;
+    # Dont load any RawData* or Comparative views, 
+    # Dont load Alignments unless they are from Gingeras or Wold labs (RNA folks like to  see their RNAs)
+    # Riken group have RawData and RawData2 because they have colorspace fasta and quality files
+    # Wold group have RawData, RawData2, RawData3, RawData4 
+    return ($view =~ m/^RawData[0-9]?$/ or $view eq 'Comparative' 
+	or ($view eq 'Alignments' and $grant ne "Gingeras" and $grant ne "Wold")) ? 1 : 0;
+}
+
 sub printCompositeTdbSettings {
 # prints out trackDb.ra settings for the composite track
     local *OUT_FILE = shift;
     my ($daf,%ddfSets) = @_;
@@ -1046,12 +1056,9 @@
     # Cycle through to get best view to default labels and to get all views and terms
     for my $view (keys %{$daf->{TRACKS}}) {
         for my $key (keys %ddfSets) {
             if(defined($ddfSets{$key}{VIEWS}{$view})) {
-		# Load alignments for all Gingeras labs except CSHL as these are currently 100-400M rows
-                my $downloadOnly = $view eq 'RawData' || $view eq 'RawData2' || 
-			$view eq 'RawData3' || $view eq 'RawData4' || 
-			($view eq 'Alignments' and ($daf->{grant} ne "Gingeras" or $daf->{lab} eq "Cshl")) ? 1 : 0;
+                my $downloadOnly = isDownloadOnly($view, $daf->{grant}, $daf->{lab});
                 if(!$downloadOnly) {
                     $setting = $setting . " " . $view . "=" . $view;
                     $visDefault = $visDefault . " " . $view . "=";
                     if($view eq "Peaks") {
@@ -1651,11 +1658,11 @@
         }
     }
 
     # XXXX Move the decision about which views have tracks into the DAF?
-    # Gingeras group need to see their alignments
-    # Riken group have RawData and RawData2 because they have colorspace fasta and quality files
-    my $downloadOnly = $view eq 'RawData' || $view eq 'RawData2'|| $view eq 'Comparative' || ($view eq 'Alignments' and $daf->{grant} ne "Gingeras") ? 1 : 0;
+    # 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});
 
     print LOADER_RA "tablename $tableName\n";
     print LOADER_RA "view $view\n";
     print LOADER_RA "type $type\n";