src/hg/hgCustom/hgCustom.c 1.141

1.141 2010/05/11 01:43:24 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields. 
Index: src/hg/hgCustom/hgCustom.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgCustom/hgCustom.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -b -B -U 4 -r1.140 -r1.141
--- src/hg/hgCustom/hgCustom.c	16 Mar 2010 06:55:49 -0000	1.140
+++ src/hg/hgCustom/hgCustom.c	11 May 2010 01:43:24 -0000	1.141
@@ -384,9 +384,9 @@
 
 if (isUpdateForm)
     {
     /* hidden variables to identify track */
-    cgiMakeHiddenVar(hgCtUpdatedTable, ct->tdb->tableName);
+    cgiMakeHiddenVar(hgCtUpdatedTable, ct->tdb->track);
     char buf[512];
     char *shortLabel = htmlEncode(ct->tdb->shortLabel);
     char *longLabel = htmlEncode(ct->tdb->longLabel);
     safef(buf, sizeof buf, "track name='%s' description='%s'",
@@ -496,9 +496,9 @@
             sameString(ct->tdb->type, "chromGraph"))
         printf("<TR><TD>%s</A></TD>", shortLabel);
     else
 	{
-	char *cgiName = cgiEncode(ct->tdb->tableName);
+	char *cgiName = cgiEncode(ct->tdb->track);
         printf("<TR><TD><A TITLE='Update custom track: %s' HREF='%s?%s&%s=%s'>%s</A></TD>", 
             shortLabel, hgCustomName(),cartSidUrlString(cart),
 	    hgCtTable, cgiName, shortLabel);
 	freeMem(cgiName);
@@ -554,18 +554,18 @@
 	}
     /* Delete checkboxes */
     printf("<TD COLSPAN=%d ALIGN=CENTER>", showAllButtons ? 2 : 1);
     safef(buf, sizeof(buf), "%s_%s", hgCtDeletePrefix, 
-            ct->tdb->tableName);
+            ct->tdb->track);
     cgiMakeCheckBox(buf, setAllDelete);
     puts("</TD>");
 
     /* Update checkboxes */
     if (updateCt)
         {
         printf("<TD COLSPAN=%d ALIGN=CENTER>", showAllButtons ? 2 : 1);
         safef(buf, sizeof(buf), "%s_%s", hgCtRefreshPrefix, 
-                ct->tdb->tableName);
+                ct->tdb->track);
         if ((dataUrl = ctDataUrl(ct)) != NULL)
             cgiMakeCheckBoxWithMsg(buf, setAllUpdate, dataUrl);
         else
             puts("&nbsp;");
@@ -889,9 +889,9 @@
 struct customTrack *ct;
 for (ct = ctList; ct != NULL; ct = ct->next)
     {
     char var[256];
-    safef(var, sizeof var, "%s_%s", hgCtDeletePrefix, ct->tdb->tableName);
+    safef(var, sizeof var, "%s_%s", hgCtDeletePrefix, ct->tdb->track);
     if (cartBoolean(cart, var))
 	slRemoveEl(&ctList, ct);
     }
 }
@@ -905,18 +905,18 @@
 
 for (ct = ctList; ct != NULL; ct = ct->next)
     {
     char var[256];
-    safef(var, sizeof var, "%s_%s", hgCtRefreshPrefix, ct->tdb->tableName);
+    safef(var, sizeof var, "%s_%s", hgCtRefreshPrefix, ct->tdb->track);
     if (cartUsualBoolean(cart, var, FALSE))
 	{
 	struct customTrack *nextCt = NULL, *urlCt = NULL;
 	struct customTrack *urlCts = 
 	    customFactoryParse(database, ctDataUrl(ct), FALSE, NULL);
 	for (urlCt = urlCts; urlCt != NULL; urlCt = nextCt)
 	    {
 	    nextCt = urlCt->next;
-	    if (sameString(ct->tdb->tableName, urlCt->tdb->tableName))
+	    if (sameString(ct->tdb->track, urlCt->tdb->track))
 		slAddHead(&refreshCts, urlCt);
 	    }
 	}
     }
@@ -971,14 +971,14 @@
     }
 return (dyStringCannibalize(&ds));
 }
 
-struct customTrack *ctFromList(struct customTrack *ctList, char *tableName)
+struct customTrack *ctFromList(struct customTrack *ctList, char *track)
 /* return custom track from list */
 {
 struct customTrack *ct = NULL;
 for (ct = ctList; ct != NULL; ct = ct->next)
-    if (sameString(tableName, ct->tdb->tableName))
+    if (sameString(track, ct->tdb->track))
         return ct;
 return NULL;
 }