c2c65344c6ae672dbc05e7920049803c3fe29874
tdreszer
  Thu Sep 16 12:29:34 2010 -0700
Fixed tdbVisLimitedByAncestry which caused supertrack contained and visibble tracks to appear hidden in findTracks.  Added composite/view vis reshaping based upon subtrack specific vis.
diff --git src/hg/inc/cart.h src/hg/inc/cart.h
index b909dc3..fea852c 100644
--- src/hg/inc/cart.h
+++ src/hg/inc/cart.h
@@ -85,6 +85,12 @@
  * from cart.  Except array may be NULL in which case all
  * are removed. */
 
+struct slPair *cartVarsLike(struct cart *cart, char *wildCard);
+/* Return a slPair list of cart vars that match the wildcard */
+
+struct slPair *cartVarsWithPrefix(struct cart *cart, char *prefix);
+/* Return a slPair list of cart vars that begin with prefix */
+
 void cartRemoveLike(struct cart *cart, char *wildCard);
 /* Remove all variable from cart that match wildCard. */
 
@@ -517,14 +523,8 @@
 boolean cartValueHasChanged(struct cart *newCart,struct hash *oldVars,char *setting,boolean ignoreRemoved,boolean ignoreCreated);
 /* Returns TRUE if new cart setting has changed from old cart setting */
 
-struct slRef *cartNamesLike(struct cart *cart, char *wildCard);
-/* Returns reference list of all variable names that match wildCard. */
-
-struct slRef *cartNamesPrefixedBy(struct cart *cart, char *prefix);
-/* Returns reference list of all variable names with given prefix. */
-
 int cartNamesPruneChanged(struct cart *newCart,struct hash *oldVars,
-                          struct slRef **cartNames,boolean ignoreRemoved,boolean unChanged);
+                          struct slPair **cartNames,boolean ignoreRemoved,boolean unChanged);
 /* Prunes a list of cartNames if the settings have changed between new and old cart.
    Returns pruned count */
 
@@ -532,6 +532,10 @@
 /* Removes a 'trackName.suffix' from all tdb descendents (but not parent).
    If suffix NULL then removes 'trackName' which holds visibility */
 
+boolean cartTdbTreeMatchSubtrackVis(struct cart *cart,struct trackDb *tdbComposite);
+/* When subtrack vis is set via findTracks, and composite has no cart settings,
+   then fashion composite to match found */
+
 boolean cartTdbTreeCleanupOverrides(struct trackDb *tdb,struct cart *newCart,struct hash *oldVars);
 /* When composite/view settings changes, remove subtrack specific settings
    Returns TRUE if any cart vars are removed */