src/hg/hgTables/seqOut.c 1.21

1.21 2009/04/10 20:04:29 tdreszer
Fix many instances of using composite tdb when subtrack tdb is needed
Index: src/hg/hgTables/seqOut.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/seqOut.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -B -U 4 -r1.20 -r1.21
--- src/hg/hgTables/seqOut.c	17 Mar 2009 04:28:39 -0000	1.20
+++ src/hg/hgTables/seqOut.c	10 Apr 2009 20:04:29 -0000	1.21
@@ -170,9 +170,9 @@
         doRefGeneMrnaSequence(conn, bedList);
     }
 else
     {
-    char *dupType = cloneString(curTrack->type);
+    char *dupType = cloneString(findTypeForTable(database, curTrack, curTable));
     typeWordCount = chopLine(dupType, typeWords);
     if (typeIx >= typeWordCount)
 	internalErr();
     table = typeWords[typeIx];
@@ -280,10 +280,10 @@
 
 void doOutSequence(struct sqlConnection *conn)
 /* Output sequence page. */
 {
-if (curTrack != NULL && sameString(curTrack->tableName, curTable) 
-	&& startsWith("genePred", curTrack->type))
-    genePredOptions(curTrack, curTrack->type, conn);
+struct trackDb *tdb = findTdbForTable(database, curTrack, curTable);
+if (tdb != NULL && startsWith("genePred", tdb->type))
+    genePredOptions(tdb, curTrack->type, conn);
 else
     genomicFormatPage(conn);
 }