39e2e81baf7e762a372ac5502d68d7473c75908d larrym Thu Jul 26 13:21:22 2012 -0700 move some stuff into css file diff --git src/hg/lib/hgFind.c src/hg/lib/hgFind.c index 47a882c..3ec283d 100644 --- src/hg/lib/hgFind.c +++ src/hg/lib/hgFind.c @@ -2370,55 +2370,61 @@ if ((row = sqlNextRow(sr)) != NULL) dyStringPrintf(dy, "%s", row[0]); sqlFreeResult(&sr); } if (dy->stringSize > 0) pos->description = cloneString(dy->string); dyStringFree(&dy); } found = TRUE; } } hFreeConn(&conn); return(found); } -void hgPositionsHtml(char *db, struct hgPositions *hgp, FILE *f, +static void hgPositionsHtml(char *db, struct hgPositions *hgp, FILE *f, boolean useWeb, char *hgAppName, struct cart *cart) /* Write out hgp table as HTML to file. */ { struct hgPosTable *table; struct hgPos *pos; char *desc; char range[HGPOSRANGESIZE]; char *ui = getUiUrl(cart); char *extraCgi = hgp->extraCgi; char hgAppCombiner = (strchr(hgAppName, '?')) ? '&' : '?'; +boolean containerDivPrinted = FALSE; if (useWeb) webStart(cart, db, "Select Position"); for (table = hgp->tableList; table != NULL; table = table->next) { if (table->posList != NULL) { char *parent = hGetParent(db, table->name); char *trackName = hGetTrackForTable(db, table->name); if (trackName == NULL) errAbort("no track for table \"%s\" found via a findSpec", table->name); // wish we had searchName char *vis = hCarefulTrackOpenVis(db, trackName); boolean excludeTable = FALSE; + if(!containerDivPrinted) + { + fprintf(f, "
\n"); + containerDivPrinted = TRUE; + } if (table->htmlStart) table->htmlStart(table, f); else fprintf(f, "

%s

\n", table->description);
 	for (pos = table->posList; pos != NULL; pos = pos->next)
 	    {
 	    if (table->htmlOnePos)
 	        table->htmlOnePos(table, pos, f);
 	    else
 		{
 		char *matches = excludeTable ? "" : pos->browserName;
 		char *encMatches = cgiEncode(matches);
 		hgPosBrowserRange(pos, range);
 		fprintf(f, "htmlEnd) 
 	    table->htmlEnd(table, f);
 	else
 	    fprintf(f, "
\n"); } } +if(containerDivPrinted) + fprintf(f, "
\n"); + if (useWeb) webEnd(); } static struct hgPositions *genomePos(char *db, char *spec, char **retChromName, int *retWinStart, int *retWinEnd, struct cart *cart, boolean showAlias, boolean useWeb, char *hgAppName) /* Search for positions in genome that match user query. * Return an hgp if the query results in a unique position. * Otherwise display list of positions, put # of positions in retWinStart, * and return NULL. */ { struct hgPositions *hgp = NULL; char *terms[16];