src/hg/lib/hdb.c 1.431
1.431 2010/05/20 19:03:07 kent
Making makeTrackSettingsHash use tableName from database rather than track from settings as key, for slightly better backwards compatibility.
Index: src/hg/lib/hdb.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hdb.c,v
retrieving revision 1.430
retrieving revision 1.431
diff -b -B -U 4 -r1.430 -r1.431
--- src/hg/lib/hdb.c 20 May 2010 16:18:45 -0000 1.430
+++ src/hg/lib/hdb.c 20 May 2010 19:03:07 -0000 1.431
@@ -3764,16 +3764,15 @@
{
if (hTableExists(db, trackTable->name))
{
char query[512];
- safef(query, sizeof(query), "select settings from %s", trackTable->name);
+ safef(query, sizeof(query), "select tableName,settings from %s", trackTable->name);
struct sqlResult *sr = sqlGetResult(conn, query);
char **row;
while ((row = sqlNextRow(sr)) != NULL)
{
- struct hash *settings = trackDbSettingsFromString(row[0]);
- char *track = hashMustFindVal(settings, "track");
- hashAdd(hash, track, settings);
+ struct hash *settings = trackDbSettingsFromString(row[1]);
+ hashAdd(hash, row[0], settings);
}
sqlFreeResult(&sr);
}
}