src/hg/hgTables/hgTables.h 1.134

Index: src/hg/hgTables/hgTables.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/hgTables.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -b -B -U 4 -r1.133 -r1.134
--- src/hg/hgTables/hgTables.h	19 Mar 2009 00:42:38 -0000	1.133
+++ src/hg/hgTables/hgTables.h	10 Apr 2009 20:04:29 -0000	1.134
@@ -112,11 +112,8 @@
 
 boolean anyCompression();
 /*  Check if any compressed file output has been requested */
 
-struct trackDb *findCompositeTdb(struct trackDb *track, char *table);
-/*	find the tdb for the table, if it is custom or composite or ordinary  */
-
 void initGroupsTracksTables(struct sqlConnection *conn);
 /* Get list of groups that actually have something in them. */
 
 struct region *getRegions();
@@ -799,9 +796,9 @@
 /* Get list of beds from custom track of given name that are
  * in current regions and that pass filters.  You can bedFree
  * this when done. */
 
-struct customTrack *lookupCt(char *name);
+#define lookupCt(name) ctFind(getCustomTracks(),name)
 /* Find named custom track. */
 
 struct customTrack *newCt(char *ctName, char *ctDesc, int visNum, char *ctUrl,
 			  int fields);
@@ -1030,13 +1027,20 @@
  *	filters.  You can bedFree this when done.  */
 
 /* --------------- microarray track functions ------------- */
 
-boolean isMicroarray(struct trackDb *curTrack, char *table);
+boolean isMicroarray(struct trackDb *parent, char *table);
 /* Return TRUE if table is specified as a microarray in the current database's 
  * trackDb. */
 
 void doOutMicroarrayNames(struct trackDb *tdb);
 /* Show the microarray names from .ra file */
 
 #define uglyw warn	/* Warn for debugging purposes. */
+
+struct trackDb *findTdbForTable(char *db,struct trackDb *parent,char *table);
+/* Find or creates the tdb for this table. */
+
+char *findTypeForTable(char *db,struct trackDb *parent,char *table);
+/* Finds the TrackType for this Table */
+
 #endif /* HGTABLES_H */