src/hg/hgTables/hgTables.c 1.194

Index: src/hg/hgTables/hgTables.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/hgTables.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -b -B -U 4 -r1.193 -r1.194
--- src/hg/hgTables/hgTables.c	22 Apr 2010 19:25:22 -0000	1.193
+++ src/hg/hgTables/hgTables.c	11 May 2010 01:43:25 -0000	1.194
@@ -177,9 +177,9 @@
 
 char *curTableLabel()
 /* Return label for current table - track short label if it's a track */
 {
-if (curTrack != NULL && sameString(curTrack->tableName, curTable))
+if (curTrack != NULL && sameString(curTrack->table, curTable))
     return curTrack->shortLabel;
 else
     return curTable;
 }
@@ -226,19 +226,23 @@
 
 static struct trackDb *getFullTrackList()
 /* Get all tracks including custom tracks if any. */
 {
-struct trackDb *list = hTrackDb(database, NULL), *tdb;
+struct trackDb *list = hTrackDb(database, NULL);
 struct customTrack *ctList, *ct;
 
+#ifdef UNUSED
 /* Change the mrna track to all_mrna to avoid confusion elsewhere. */
+struct trackDb *tdb;
 for (tdb = list; tdb != NULL; tdb = tdb->next)
     {
-    if (sameString(tdb->tableName, "mrna"))
+    if (sameString(tdb->table, "mrna"))
         {
-	tdb->tableName = cloneString("all_mrna");
+	tdb->table = cloneString("all_mrna");
 	}
     }
+#endif /* UNUSED */
+
 /* add wikiTrack if enabled */
 if (wikiTrackEnabled(database, NULL))
     wikiTrackDb(&list);
 
@@ -482,25 +486,29 @@
     return cloneString(dbTable);
     }
 }
 
+#ifdef UNUSED
 char *trackTable(char *rawTable)
 /* Return table name for track, substituting all_mrna
  * for mRNA if need be. */
 {
 char *table = rawTable;
 return table;
 }
+#endif /* UNUSED */
 
 char *connectingTableForTrack(char *rawTable)
 /* Return table name to use with all.joiner for track.
  * You can freeMem this when done. */
 {
+#ifdef UNUSED
 if (sameString(rawTable, "mrna"))
     return cloneString("all_mrna");
 else if (sameString(rawTable, "est"))
     return cloneString("all_est");
 else
+#endif /* UNUSED */
     return cloneString(rawTable);
 }
 
 char *chromTable(struct sqlConnection *conn, char *table)
@@ -722,9 +730,9 @@
 if (group != NULL && sameString(group->name, "all"))
     group = NULL;
 for (track = trackList; track != NULL; track = track->next)
     {
-    if (sameString(name, track->tableName) &&
+    if (sameString(name, track->table) &&
        (group == NULL || sameString(group->name, track->grp)))
        return track;
     }
 return NULL;
@@ -761,9 +769,9 @@
 struct trackDb *track = NULL;
 
 if (name != NULL)
     {
-    /* getFullTrackList tweaks tdb->tableName mrna to all_mrna, so in
+    /* getFullTrackList tweaks tdb->table mrna to all_mrna, so in
      * case mrna is passed in (e.g. from hgc link to schema page)
      * tweak it here too: */
     if (sameString(name, "mrna"))
 	name = "all_mrna";
@@ -818,9 +826,9 @@
 for (track = trackList; track != NULL; track = track->next)
     {
     if (!hashLookup(groupsInDatabase, track->grp))
          warn("Track %s has group %s, which isn't in grp table",
-	 	track->tableName, track->grp);
+	 	track->table, track->grp);
     }
 
 /* Create dummy group for all tracks. */
 AllocVar(group);
@@ -910,11 +918,11 @@
 	struct slRef *tdbRef;
 	for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
             {
 	    struct trackDb *subTdb = tdbRef->val;
-	    name = slNameNew(subTdb->tableName);
+	    name = slNameNew(subTdb->table);
 	    slAddTail(&subList, name);
-	    hashAdd(uniqHash, subTdb->tableName, NULL);
+	    hashAdd(uniqHash, subTdb->table, NULL);
             }
         pList = slCat(pList, subList);
         }
     }
@@ -925,9 +933,9 @@
 /* Return list of all tables associated with track. */
 {
 struct hash *uniqHash = newHash(8);
 struct slName *name, *nameList = NULL;
-char *trackTable = track->tableName;
+char *trackTable = track->table;
 
 hashAdd(uniqHash, trackTable, NULL);
 if (useJoiner)
     {
@@ -968,10 +976,10 @@
  * found. */
 {
 if (track == NULL)
     return cartString(cart, var);
-else if (isCustomTrack(track->tableName))
-    return track->tableName;
+else if (isCustomTrack(track->table))
+    return track->table;
 else
     {
     struct slName *tableList = tablesForTrack(track, TRUE);
     char *table = cartUsualString(cart, var, tableList->name);
@@ -1014,15 +1022,15 @@
 if (hti != NULL && hti->nameField[0] != 0)
     idField = cloneString(hti->nameField);
 else if (track != NULL)
     {
-    struct hTableInfo *trackHti = maybeGetHtiOnDb(db, track->tableName);
+    struct hTableInfo *trackHti = maybeGetHtiOnDb(db, track->table);
     if (trackHti != NULL && isCustomTrack(table))
         idField = cloneString(trackHti->nameField);
     else if (hti != NULL && trackHti != NULL && trackHti->nameField[0] != 0)
         {
         struct joinerPair *jp, *jpList;
-        jpList = joinerRelate(allJoiner, db, track->tableName);
+        jpList = joinerRelate(allJoiner, db, track->table);
         for (jp = jpList; jp != NULL; jp = jp->next)
             {
             if (sameString(jp->a->field, trackHti->nameField))
                 {
@@ -1483,17 +1491,17 @@
 	track = cTdb;
     }
 if (track != NULL)
     {
-    if (sameString(track->tableName, "gvPos") &&
+    if (sameString(track->table, "gvPos") &&
 	!cartVarExists(cart, "gvDisclaimer"))
 	{
 	/* display disclaimer and add flag to cart, program exits from here */
 	htmlSetBackground(hBackgroundImage());
 	htmlStart("Table Browser");
 	gvDisclaimer();
 	}
-    else if (sameString(track->tableName, "gvPos") &&
+    else if (sameString(track->table, "gvPos") &&
 	     sameString(cartString(cart, "gvDisclaimer"), "Disagree"))
 	{
 	cartRemove(cart, "gvDisclaimer");
 	cartRemove(cart, hgtaDoTopSubmit);