78b1d164fe87484978b6475cd271e3d44a08ec39
kent
  Fri Jul 2 18:51:46 2010 -0700
Eliminating inputTracks and inputTrackSelGroup tags, which have been replaced with the inputTrackTable tag.
diff --git src/hg/hgc/peakClusters.c src/hg/hgc/peakClusters.c
index 7208d67..5102a73 100644
--- src/hg/hgc/peakClusters.c
+++ src/hg/hgc/peakClusters.c
@@ -154,15 +154,13 @@
 static struct slName *findMatchingSubtracks(struct trackDb *tdb)
 /* Find subtracks that match inputTracks tags. */
 {
-/* Get list of tracks we'll look through for input. */
-char *inputTracks = trackDbRequiredSetting(tdb, "inputTracks");
-struct slName *inTrackList = stringToSlNames(inputTracks);
-
-/* Get list of subgroups to select on */
-char *inputTracksSubgroupSelect = trackDbRequiredSetting(tdb, "inputTracksSubgroupSelect");
-struct slPair *selGroupList = slPairFromString(inputTracksSubgroupSelect);
-
-struct slName *matchTrackList = encodeFindMatchingSubtracks(inTrackList, selGroupList);
+/* Just list look up tableName in inputTrackTable and return the list. */
+char *inputTrackTable = trackDbRequiredSetting(tdb, "inputTrackTable");
+struct sqlConnection *conn = hAllocConn(database);
+char query[256];
+safef(query, sizeof(query), "select tableName from %s order by source", inputTrackTable);
+struct slName *matchTrackList = sqlQuickList(conn, query);
+hFreeConn(&conn);
 return matchTrackList;
 }
 
@@ -292,25 +290,6 @@
     printf("<B>Cluster Score (out of 1000):</B> %d<BR>\n", cluster->score);
     printPos(cluster->chrom, cluster->chromStart, cluster->chromEnd, NULL, TRUE, NULL);
 
-#ifdef OLD
-    /* Get list of tracks we'll look through for input. */
-    struct slName *inTrackList = stringToSlNames(inputTracks);
-
-    /* Get list of subgroups to select on */
-    char *inputTracksSubgroupSelect = trackDbRequiredSetting(tdb, "inputTracksSubgroupSelect");
-    struct slPair *selGroupList = slPairFromString(inputTracksSubgroupSelect);
-
-    /* Add factorId as selection criteria*/
-    /* Figure out factor ID and add it as selection criteria*/
-    char *factorId = findFactorId(inTrackList, cluster->name);
-    struct slPair *factorSel = slPairNew("factor", cloneString(factorId));
-    slAddHead(&selGroupList, factorSel);
-
-    /* Get list of tracks that match criteria. */
-    struct slName *matchTrackList = encodeFindMatchingSubtracks(inTrackList, selGroupList);
-    struct slName *matchTrack;
-#endif /* OLD */
-
     /* Get list of tracks we'll look through for input. */
     char *inputTrackTable = trackDbRequiredSetting(tdb, "inputTrackTable");
     safef(query, sizeof(query), "select tableName from %s where factor='%s' order by source", inputTrackTable, cluster->name);
@@ -365,7 +344,6 @@
 	}
     sqlFreeResult(&sr);
     webPrintLinkTableEnd();
-
     }
 }