e7b2da51ba638fe7f6f4379c6c9470321ac0a88e
tdreszer
  Thu Dec 22 11:20:00 2011 -0800
Removed old ifdefs.  No functional change here.
diff --git src/hg/hgTracks/searchTracks.c src/hg/hgTracks/searchTracks.c
index 3ba4b38..768a99f 100644
--- src/hg/hgTracks/searchTracks.c
+++ src/hg/hgTracks/searchTracks.c
@@ -20,32 +20,30 @@
 #include "trix.h"
 #include "jsHelper.h"
 #include "imageV2.h"
 
 
 #define TRACK_SEARCH_FORM        "trackSearch"
 #define SEARCH_RESULTS_FORM      "searchResults"
 #define TRACK_SEARCH_CURRENT_TAB "tsCurTab"
 #define TRACK_SEARCH_SIMPLE      "tsSimple"
 #define TRACK_SEARCH_ON_NAME     "tsName"
 #define TRACK_SEARCH_ON_TYPE     "tsType"
 #define TRACK_SEARCH_ON_GROUP    "tsGroup"
 #define TRACK_SEARCH_ON_DESCR    "tsDescr"
 #define TRACK_SEARCH_SORT        "tsSort"
 
-#define SUPPORT_SUBTRACKS_INHERIT_DESCRIPTION
-
 static int gCmpGroup(const void *va, const void *vb)
 /* Compare groups based on label. */
 {
 const struct group *a = *((struct group **)va);
 const struct group *b = *((struct group **)vb);
 return strcmp(a->label, b->label);
 }
 
 // Would like to do a radio button choice ofsorts
 enum sortBy
     {
     sbRelevance=0,
     sbAbc      =1,
     sbHierarchy=2,
     };
@@ -286,38 +284,34 @@
                     tracksFound++;
                     refAdd(&tracks, track);
                     }
                 else
                     warn("found group track is NULL.");
                 }
             if (track->subtracks != NULL)
                 {
                 struct track *subTrack;
                 for (subTrack = track->subtracks; subTrack != NULL; subTrack = subTrack->next)
                     {
                     trackType = cloneFirstWord(subTrack->tdb->type); // will be spilled
                     if ((matchingTracks == NULL || hashLookup(matchingTracks, subTrack->track) != NULL)
                     && (isEmpty(typeSearch) || sameWord(typeSearch, trackType))
                     && (isEmpty(nameSearch) || searchNameMatches(subTrack->tdb, nameList))
-                #ifdef SUPPORT_SUBTRACKS_INHERIT_DESCRIPTION
-                    && (isEmpty(descSearch)
+                    && (isEmpty(descSearch) // subtracks inherit description
                         || searchDescriptionMatches(subTrack->tdb, descList)
                         || (tdbIsCompositeChild(subTrack->tdb) && subTrack->parent
                             && searchDescriptionMatches(subTrack->parent->tdb, descList))))
-                #else///ifndef SUPPORT_SUBTRACKS_INHERIT_DESCRIPTION
-                    && (isEmpty(descSearch) || searchDescriptionMatches(subTrack->tdb, descList)))
-                #endif///ndef SUPPORT_SUBTRACKS_INHERIT_DESCRIPTION
                         {
                         if (track != NULL)
                             {
                             tracksFound++;
                             refAdd(&tracks, subTrack);
                             }
                         else
                             warn("found subtrack is NULL.");
                         }
                     }
                 }
             }
         }
     }