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

1.222 2010/04/22 20:57:07 tdreszer
Fixed a couple of bugs from the last checkin
Index: src/hg/encode/encodeValidate/doEncodeValidate.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeValidate/doEncodeValidate.pl,v
retrieving revision 1.221
retrieving revision 1.222
diff -b -B -U 4 -r1.221 -r1.222
--- src/hg/encode/encodeValidate/doEncodeValidate.pl	22 Apr 2010 19:56:50 -0000	1.221
+++ src/hg/encode/encodeValidate/doEncodeValidate.pl	22 Apr 2010 20:57:07 -0000	1.222
@@ -1730,16 +1730,8 @@
             $inputType .= "/" . $ddfLine->{control} if $ddfLine->{control};
             $metadata .= " inputType=$inputType";
         }
     }
-    if(!$ddfLine->{inputType} && $daf->{dataType} =~/ChIPseq/i) {
-        my $inputType = $ddfLine->{cell};
-        $inputType .= "/" . $ddfLine->{treatment} if $ddfLine->{treatment};
-        $inputType .= "/Input"; # default inputType for ChIPseq is "Input" instead of antibody
-        $inputType .= "/" . $ddfLine->{protocol} if $ddfLine->{protocol};
-        $inputType .= "/" . $ddfLine->{control} if $ddfLine->{control};
-        $metadata .= " inputType=$inputType";
-    }
     $metadata .= " view=$view";
     $metadata .= " replicate=$ddfLine->{replicate}" if $ddfLine->{replicate} && $daf->{TRACKS}{$view}{hasReplicates};
     $metadata .= " labVersion=$ddfLine->{labVersion}" if $ddfLine->{labVersion};
     $metadata .= " softwareVersion=$ddfLine->{softwareVersion}" if $ddfLine->{softwareVersion};
@@ -1762,9 +1754,9 @@
         }
     }
     # Construct table name from track name and variables
     my $tableName = "$compositeTrack";
-    my %shortViewMap = (Peaks => 'Pk', Signal => 'Sig', RawSignal => 'Raw', PlusRawSignal => 'PlusRaw', MinusRawSignal => 'MinusRaw');
+    my %shortViewMap = (Peaks => 'Pk', Signal => 'Sig', RawSignal => 'Raw', Alignments => 'Aln', PlusRawSignal => 'PlusRaw', MinusRawSignal => 'MinusRaw');
 
     if(!defined($daf->{TRACKS}{$view}{shortLabelPrefix})) {
         $daf->{TRACKS}{$view}{shortLabelPrefix} = "";
     }