src/hg/lib/cart.c 1.119
1.119 2010/05/11 01:43:29 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/lib/cart.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/cart.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -b -B -U 4 -r1.118 -r1.119
--- src/hg/lib/cart.c 14 Apr 2010 07:42:57 -0000 1.118
+++ src/hg/lib/cart.c 11 May 2010 01:43:29 -0000 1.119
@@ -1664,9 +1664,9 @@
tdb = tdb->parent;
for ( ; tdb != NULL; tdb = tdb->parent)
{
char buf[512];
- safef(buf, sizeof buf, "%s.%s", tdb->tableName,suffix);
+ safef(buf, sizeof buf, "%s.%s", tdb->track,suffix);
char *cartSetting = hashFindVal(cart->hash, buf);
if (cartSetting != NULL)
{
if(pVariable != NULL)
@@ -1721,9 +1721,9 @@
/* returns the ClosestToHome cart variable, but will remove any cart variable
most recently superceded */
{
char childVar[512];
-safef(childVar, sizeof childVar, "%s.%s", tdb->tableName,suffix);
+safef(childVar, sizeof childVar, "%s.%s", tdb->track,suffix);
char *lowestVar = childVar;
char *lowestVal = hashFindVal(cart->hash, childVar);
if(!tdbIsCompositeChild(tdb))
return lowestVal;
@@ -1736,15 +1736,15 @@
char *parentVal = NULL;
char *stView;
if(subgroupFind(tdb,"view",&stView))
{
- safef(parentVar,sizeof parentVar,"%s.%s.%s",tdb->parent->tableName,stView,suffix);
+ safef(parentVar,sizeof parentVar,"%s.%s.%s",tdb->parent->track,stView,suffix);
parentVal = hashFindVal(cart->hash, parentVar);
cartPairNormalize(cart,oldCart,&lowestVar,&lowestVal,parentVar,parentVal);
}
if(!oneLevel)
{
- safef(parentVar,sizeof parentVar,"%s.%s",tdb->parent->tableName,suffix);
+ safef(parentVar,sizeof parentVar,"%s.%s",tdb->parent->track,suffix);
parentVal = hashFindVal(cart->hash, parentVar);
cartPairNormalize(cart,oldCart,&lowestVar,&lowestVal,parentVar,parentVal);
}
return lowestVal?lowestVal:parentVal;
@@ -1848,13 +1848,13 @@
void cartRemoveAllForTdb(struct cart *cart, struct trackDb *tdb)
/* Remove all variables from cart that are associated with this tdb. */
{
char setting[256];
-safef(setting,sizeof(setting),"%s.",tdb->tableName);
+safef(setting,sizeof(setting),"%s.",tdb->track);
cartRemovePrefix(cart,setting);
-safef(setting,sizeof(setting),"%s_",tdb->tableName); // TODO: All should be {tableName}.{varName}... Fix {tableName}_sel
+safef(setting,sizeof(setting),"%s_",tdb->track); // TODO: All should be {track}.{varName}... Fix {track}_sel
cartRemovePrefix(cart,setting);
-cartRemove(cart,tdb->tableName);
+cartRemove(cart,tdb->track);
}
void cartRemoveAllForTdbAndChildren(struct cart *cart, struct trackDb *tdb)
/* Remove all variables from cart that are associated