src/hg/lib/hdb.c 1.432

1.432 2010/05/20 23:10:05 angie
makeDbTableToTrackHash should also use tableName from database (hel->name) and add all_mrna/all_est table if an older trackDb doesn't have that setting.

Index: src/hg/lib/hdb.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hdb.c,v
retrieving revision 1.431
retrieving revision 1.432
diff -b -B -U 4 -r1.431 -r1.432
--- src/hg/lib/hdb.c	20 May 2010 19:03:07 -0000	1.431
+++ src/hg/lib/hdb.c	20 May 2010 23:10:05 -0000	1.432
@@ -3811,12 +3811,20 @@
 struct hashEl *hel;
 while ((hel = hashNext(&cookie)) != NULL)
     {
     struct hash *settings = hel->val;
-    char *track = hashMustFindVal(settings, "track");
+    char *track = hel->name;
     char *table = hashFindVal(settings, "table");
     if (table == NULL)
+	{
+	// backwards compatibility with older trackDb:
+	if (sameString(track, "mrna"))
+	    table = "all_mrna";
+	else if (sameString(track, "est"))
+	    table = "all_est";
+	else
 	 table = track;
+	}
     hashAdd(tableToTrackHash, table, track);
     }
 hFreeConn(&conn);
 return tableToTrackHash;