1b75816b3f5433f05ad8da9645e12db8a1229532 kent Tue Feb 8 17:48:37 2011 -0800 Making terminology about importing tracks and data hubs more consistent. diff --git src/hg/hgHubConnect/hgHubConnect.c src/hg/hgHubConnect/hgHubConnect.c index 0dc9e16..a965529 100644 --- src/hg/hgHubConnect/hgHubConnect.c +++ src/hg/hgHubConnect/hgHubConnect.c @@ -12,31 +12,31 @@ #include "htmshell.h" #include "hdb.h" #include "hui.h" #include "cart.h" #include "dbDb.h" #include "web.h" #include "trackHub.h" #include "hubConnect.h" static char const rcsid[] = "$Id: hgPcr.c,v 1.29 2009/09/23 18:42:17 angie Exp $"; struct cart *cart; /* The user's ui state. */ struct hash *oldVars = NULL; static char *destUrl = "../cgi-bin/hgTracks"; -static char *pageTitle = "UCSC Track Hub Connect"; +static char *pageTitle = "Import Tracks from External Data Hubs"; char *database = NULL; char *organism = NULL; boolean nameInCommaList(char *name, char *commaList) /* Return TRUE if name is in comma separated list. */ { if (commaList == NULL) return FALSE; int nameLen = strlen(name); for (;;) { char c = *commaList; if (c == 0) return FALSE; if (memcmp(name, commaList, nameLen) == 0) @@ -48,35 +48,35 @@ commaList = strchr(commaList, ','); if (commaList == NULL) return FALSE; commaList += 1; } } void hgHubConnect() /* Put up the list of hubs and other controls for the page. */ { destUrl = cartUsualString(cart, hgHubConnectCgiDestUrl, destUrl); printf("<FORM ACTION=\"%s\" METHOD=\"POST\" NAME=\"mainForm\">\n", destUrl); cartSaveSession(cart); cgiMakeHiddenVar(hgHubConnectRemakeTrackHub, "on"); printf( - "<P>Track hubs are collections of tracks from outside of UCSC that can be imported into the " - "Genome Browser. To import a hub check the box in the list below. " + "<P>Track data hubs are collections of tracks from outside of UCSC that can be imported into " + "the Genome Browser. To import a hub check the box in the list below. " "After import the hub will show up as a group of tracks with its own blue " "bar and label underneath the main browser graphic, and in the configure page. To arrange " - "for your own track hub to appear in this list, please contact genome@soe.ucsc.edu.</P>\n" + "for your own track data hub to appear in this list, please contact genome@soe.ucsc.edu.</P>\n" ); getDbAndGenome(cart, &database, &organism, oldVars); printf("<B>genome:</B> %s <B>assembly:</B> %s [%s] ", organism, hFreezeDate(database), database); cgiMakeButton("submit", "submit"); printf("<BR>"); struct sqlConnection *conn = hConnectCentral(); char query[512]; safef(query, sizeof(query), "select id,shortLabel,longLabel,errorMessage,hubUrl,dbList from %s", hubConnectTableName); struct sqlResult *sr = sqlGetResult(conn, query); char **row; boolean gotAnyRows = FALSE; while ((row = sqlNextRow(sr)) != NULL)