src/hg/hgc/hgc.c 1.1629

1.1629 2010/05/20 03:21:11 kent
Making hgc output closing HTML tags that were missing in many cases. Still look to be missing in a few more though. Making a call to printAlignmentsSimple use track rather than table name to keep it like everywhere else. 
Index: src/hg/hgc/hgc.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/hgc.c,v
retrieving revision 1.1628
retrieving revision 1.1629
diff -b -B -U 4 -r1.1628 -r1.1629
--- src/hg/hgc/hgc.c	18 May 2010 22:39:08 -0000	1.1628
+++ src/hg/hgc/hgc.c	20 May 2010 03:21:11 -0000	1.1629
@@ -767,8 +767,9 @@
 if (item != NULL && item[0] != 0)
     cartWebStart(cart, database, "%s (%s)", tdb->longLabel, item);
 else
     cartWebStart(cart, database, "%s", tdb->longLabel);
+didCartHtmlStart = TRUE;
 }
 
 static struct dyString *subMulti(char *orig, int subCount,
 				 char *in[], char *out[])
@@ -3666,10 +3667,12 @@
 
 void genericClickHandler(struct trackDb *tdb, char *item, char *itemForUrl)
 /* Put up generic track info */
 {
+#ifdef OLD /* Called now by cartWebStart... */
 jsIncludeFile("jquery.js", NULL);
 jsIncludeFile("utils.js",NULL);
+#endif /* OLD */
 genericClickHandlerPlus(tdb, item, itemForUrl, NULL);
 }
 
 void savePosInTextBox(char *chrom, int start, int end)
@@ -5176,16 +5179,16 @@
 return ((psl->tStart == startFirst) && sameString(psl->tName, seqName)) == isClicked;
 }
 
 void printAlignmentsSimple(struct psl *pslList, int startFirst, char *hgcCommand,
-                           char *typeName, char *itemIn)
+                           char *trackName, char *itemIn)
 /* Print list of mRNA alignments, don't add extra textual link when
  * doesn't honor hgcCommand. */
 {
 struct psl *psl;
 int aliCount = slCount(pslList);
 boolean isClicked;
-if (pslList == NULL || typeName == NULL)
+if (pslList == NULL || trackName == NULL)
     return;
 
 if (aliCount > 1)
     printf("The alignment you clicked on is first in the table below.<BR>\n");
@@ -5202,9 +5205,9 @@
 	{
 	if (isPslToPrintByClick(psl, startFirst, isClicked))
 	    {
             char otherString[512];
-	    safef(otherString, sizeof(otherString), "%d&aliTrack=%s", psl->tStart, typeName);
+	    safef(otherString, sizeof(otherString), "%d&aliTrack=%s", psl->tStart, trackName);
             printf("<A HREF=\"%s&db=%s&position=%s%%3A%d-%d\">browser</A> | ",
                    hgTracksPathAndSettings(), database, psl->tName, psl->tStart+1, psl->tEnd);
 	    hgcAnchorSomewhere(hgcCommand, itemIn, otherString, psl->tName);
 	    printf("%5d  %5.1f%%  %9s     %s %9d %9d  %20s %5d %5d %5d</A>",
@@ -5219,29 +5222,30 @@
 printf("</TT></PRE>");
 }
 
 void printAlignments(struct psl *pslList, int startFirst, char *hgcCommand,
-		     char *typeName, char *itemIn)
+		     char *trackName, char *itemIn)
 /* Print list of mRNA alignments. */
 {
-if (pslList == NULL || typeName == NULL)
+if (pslList == NULL || trackName == NULL)
     return;
-printAlignmentsSimple(pslList, startFirst, hgcCommand, typeName, itemIn);
+char *tableName = hTableForTrack(database, trackName);
+printAlignmentsSimple(pslList, startFirst, hgcCommand, trackName, itemIn);
 
 struct psl *psl = pslList;
 for (psl = pslList; psl != NULL; psl = psl->next)
     {
     if ( pslTrimToTargetRange(psl, winStart, winEnd) != NULL
 	&&
-	!startsWith("xeno", typeName)
-	&& !(startsWith("user", typeName) && pslIsProtein(psl))
+	!startsWith("xeno", tableName)
+	&& !(startsWith("user", tableName) && pslIsProtein(psl))
 	&& psl->tStart == startFirst
         && sameString(psl->tName, seqName)
 	)
 	{
         char otherString[512];
 	safef(otherString, sizeof(otherString), "%d&aliTrack=%s",
-	      psl->tStart, typeName);
+	      psl->tStart, trackName);
 	hgcAnchorSomewhere("htcCdnaAliInWindow", cgiEncode(psl->qName),
 			   otherString, psl->tName);
 	printf("<BR>View details of parts of alignment within browser window</A>.<BR>\n");
 	}
@@ -21539,9 +21543,9 @@
 		 psl->qName);
 	if (hGenBankHaveSeq(database, itemName, NULL))
 	    {
 	    printf("<H3>%s/Genomic Alignments</H3>", name);
-	    printAlignments(psl, start, "htcCdnaAli", tdb->table,
+	    printAlignments(psl, start, "htcCdnaAli", tdb->track,
 			    encodedName);
 	    }
 	else
 	    {