src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl 1.33

Index: src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -B -U 4 -r1.32 -r1.33
--- src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl	2 Apr 2010 17:59:34 -0000	1.32
+++ src/hg/encode/encodeDownloadsPage/encodeDownloadsPage.pl	13 Apr 2010 20:18:51 -0000	1.33
@@ -30,10 +30,10 @@
     $opt_preamble
     $opt_db
     $opt_verbose
     $opt_checksum
-    $opt_noMetaTbl
-    $opt_metaTbl
+    $opt_noMdb
+    $opt_mdb
     /;
 
 our $checksumFile = "md5sum.txt";
 our $textFile = "files.txt";    # plain text file list with metadata
@@ -46,10 +46,10 @@
 
 options:
     -help               Displays this usage info
     -checksum           Generate checksum file
-    -noMetaTbl	        Don't use metaTbl.  Instead, use the old trackDb/fileDb.ra methods
-    -metaTbl=table      Use an explicit metaTbl and don't use trackDb or fileDb.ra
+    -noMdb	        Don't use an 'mdb' metadata table.  Instead, use the old trackDb/fileDb.ra methods
+    -mdb=tableName      Use an explicit mdb table (e.g. 'mdb_braney') and don't fall back on trackDb/fileDb.ra methods
     -preamble=file      File containing introductory information (written in HTML) that will be included in this file (default preamble.html)
     -db=hg18            Use a database other than the default hg18 (For aquiring releaseDate and metadata from trackDb)
     -fileType=mask	    mask for file types included (default '*.gz')
     -verbose=num        Set verbose level to num (default 1).
@@ -285,10 +285,10 @@
                     "preamble=s",
                     "db=s",
                     "verbose=i",
                     "checksum",
-                    "noMetaTbl",
-                    "metaTbl=s",
+                    "noMdb",
+                    "mdb=s",
                     );
 usage() if (!$ok);
 $opt_verbose = 1 if (!defined $opt_verbose);
 my $fileMask = "*.gz *.bb *.bw *.bam";
@@ -296,10 +296,10 @@
 
 my $preamble = "preamble.html";
    $preamble = $opt_preamble if(defined $opt_preamble);
 
-my $metaTbl = "metaTbl";
-   $metaTbl =$opt_metaTbl if(defined $opt_metaTbl);
+my $mdb = "mdb";
+   $mdb =$opt_mdb if(defined $opt_mdb);
 
 usage() if (scalar(@ARGV) < 1);
 
 # Get command-line args
@@ -390,25 +390,27 @@
     }
 
     $results = "";
     # Use the metaTbl for metadata
-    if (!defined $opt_noMetaTbl) {
-        my $queryResults = $db->execute("select var,val from $database.$metaTbl where objName = '$tableName'");
+    if (!defined $opt_noMdb) {
+        my $queryResults = $db->execute("select var,val from $database.$mdb where obj = '$tableName'");
         if($queryResults) {
             my @pairVars;
             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];
+                if($row[0] ne 'objType') {
                 push @pairVars, join('=',$row[0],$row[1] );
             }
+            }
             if(scalar(@pairVars) > 0) {
                 $results = "metadata " . join(' ',@pairVars );
             }
         }
     }
 
-    if(!defined $opt_metaTbl) {
+    if(!defined $opt_mdb) {
         if(!$results) {
             $results = $db->quickQuery("select settings from $database.trackDb where tableName = '$tableName'");
         }
         if(!$results) {