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

1.187 2009/07/13 22:34:16 kate
Change labeling for consistency
Index: src/hg/encode/encodeValidate/doEncodeValidate.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeValidate/doEncodeValidate.pl,v
retrieving revision 1.186
retrieving revision 1.187
diff -b -B -U 4 -r1.186 -r1.187
--- src/hg/encode/encodeValidate/doEncodeValidate.pl	1 Jul 2009 20:33:34 -0000	1.186
+++ src/hg/encode/encodeValidate/doEncodeValidate.pl	13 Jul 2009 22:34:16 -0000	1.187
@@ -1628,13 +1628,16 @@
             $longSuffix = "$hash{'antibody'} in $hash{'cell'} cells";
         } elsif($hash{'ripAntibody'} && $hash{'ripTgtProtein'} && $hash{'cell'}) {
             $longSuffix = "$hash{'ripTgtProtein'} in $hash{'cell'} cells using $hash{'ripAntibody'}";
             $pushQDescription = $longSuffix;
-            $shortSuffix = "$hash{'ripTgtProtein'} $hash{'cell'} $hash{'ripAntibody'}";
+            $shortSuffix = "$hash{'cell'} $hash{'ripTgtProtein'} $hash{'ripAntibody'}";
         } elsif($hash{'rnaExtract'} && $hash{'localization'} && $hash{'cell'}) {
-	    my $suf = $hash{'mapAlgorithm'} ? "$hash{'mapAlgorithm'}" : "";
-            $shortSuffix = "$hash{'rnaExtract'} $hash{'cell'} $hash{'localization'} $suf";
-            $longSuffix = "$hash{'rnaExtract'} in $hash{'cell'} cell $hash{'localization'} using $suf";
+            $shortSuffix = "$hash{'cell'} $hash{'localization'} $hash{'rnaExtract'}";
+            $longSuffix = "$hash{'rnaExtract'} in $hash{'cell'} $hash{'localization'}";
+            if ($hash{'mapAlgorithm'}) {
+                $shortSuffix = $shortSuffix . $hash{'mapAlgorithm'};
+                $longSuffix = $longSuffix . "using" . $hash{'mapAlgorithm'};
+            }
             $pushQDescription = $longSuffix;
         } elsif($hash{'freezeDate'}) {
             $shortSuffix = $hash{'freezeDate'};
             $longSuffix = $hash{'freezeDate'};