src/hg/hgTracks/simpleTracks.c 1.141

1.141 2010/05/20 19:53:22 kent
More track/table changes per Angie's suggestions at code review.
Index: src/hg/hgTracks/simpleTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/simpleTracks.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -b -B -U 4 -r1.140 -r1.141
--- src/hg/hgTracks/simpleTracks.c	18 May 2010 19:01:17 -0000	1.140
+++ src/hg/hgTracks/simpleTracks.c	20 May 2010 19:53:22 -0000	1.141
@@ -4038,9 +4038,8 @@
 boolean genePredClassFilter(struct track *tg, void *item)
 /* Returns true if an item should be added to the filter. */
 {
 struct linkedFeatures *lf = item;
-char *classString;
 char *classType = NULL;
 enum acemblyOptEnum ct;
 struct sqlConnection *conn = NULL;
 char query[1024];
@@ -4050,9 +4049,8 @@
 /* default is true then for no filtering */
 boolean sameClass = TRUE;
 classTable = trackDbSetting(tg->tdb, GENEPRED_CLASS_TBL);
 
-AllocVar(classString);
 if (classTable != NULL && hTableExists(database, classTable))
     {
     filterBy_t *filterBySet = filterBySetGet(tg->tdb,cart,NULL);
     if(filterBySet != NULL)
@@ -4078,12 +4076,13 @@
         filterBySetFree(&filterBySet);
         return passesThroughFilter;
         }
 
-    classString = addSuffix(tg->table, ".type");
     if (sameString(tg->table, "acembly"))
         {
+	char *classString = addSuffix(tg->track, ".type");
         classType = cartUsualString(cart, classString, acemblyEnumToString(0));
+	freeMem(classString);
         ct = acemblyStringToEnum(classType);
         if (ct == acemblyAll)
             return sameClass;
         }
@@ -4101,9 +4100,8 @@
             sameClass = FALSE;
         }
     sqlFreeResult(&sr);
     }
-freeMem(classString);
 hFreeConn(&conn);
 return sameClass;
 }