src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl 1.31

1.31 2010/03/25 18:59:27 tdreszer
Fixed bug that prevented non-metaTbl metadata from showing up without special flag
Index: src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -B -U 4 -r1.30 -r1.31
--- src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl	24 Mar 2010 00:59:42 -0000	1.30
+++ src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl	25 Mar 2010 18:59:27 -0000	1.31
@@ -382,26 +382,24 @@
     if(!$metaData{type}) {
         $metaData{type} = $dataType;
     }
 
+    $results = "";
     # Use the metaTbl for metadata
     if (!defined $opt_noMetaTbl) {
         my $queryResults = $db->execute("select var,val from $database.metaTbl where objName = '$tableName'");
         if($queryResults) {
             my @pairVars;
-            push @pairVars, "metadata";
             while(my @row = $queryResults->fetchrow_array()) {
 
                 # FIXME: When trackDb metadata is no longer used, this routine should be replaced with more direct metaData loading
                 #$metaData{$row[0]} = $row[1];
                 push @pairVars, join('=',$row[0],$row[1] );
-                #my $onePair = join('=',$row[0],$row[1] );
-                #push @pairVars, $onePair;
             }
-            $results = join(' ',@pairVars );
+            if(scalar(@pairVars) > 0) {
+                $results = "metadata " . join(' ',@pairVars );
+}
         }
-    } else {
-        $results = "";
     }
 
     if(!$results) {
         $results = $db->quickQuery("select settings from $database.trackDb where tableName = '$tableName'");