060ada2535fca719656219c1214a3e1c16490693
tdreszer
  Wed Nov 9 16:06:41 2011 -0800
Moved as code in hgTables down to lib and access it from hgc and hgTrackUi.  This is to remove 'extraFields' support as per Jim's request in redmine 5883 and 5582
diff --git src/hg/hgc/bigBedClick.c src/hg/hgc/bigBedClick.c
index 402e260..72b2444 100644
--- src/hg/hgc/bigBedClick.c
+++ src/hg/hgc/bigBedClick.c
@@ -1,178 +1,132 @@
 /* Handle details pages for wiggle tracks. */
 
 #include "common.h"
 #include "wiggle.h"
 #include "cart.h"
 #include "hgc.h"
 #include "hCommon.h"
 #include "hgColors.h"
 #include "bigBed.h"
 #include "hui.h"
 
-static char const rcsid[] = "$Id: bigBedClick.c,v 1.11 2010/05/11 01:43:28 kent Exp $";
-
-
-static int bigBedExtraFieldsPrint(struct trackDb *tdb, char *extraFields[],int extraCount)
-// Any extra fields defined in trackDb.  Returns number of extra fields actually printed
-{
-// Additional fields requested in trackDb?
-struct extraField *extras = extraFieldsGet(tdb);
-if (extras == NULL)
-    return 0;
-
-int ix = 0;
-struct extraField *extra = extras;
-for(;extra != NULL && ix <extraCount;extra=extra->next, ix++)
-    {
-    // Note: unlike for sql tables, extraFields is necessarily in sequential order
-
-    // Print as table rows
-    if(ix == 0)
-        printf("<br><table>");
-    printf("<tr><td><B>%s:</B></td>", extra->label);
-    switch (extra->type)
-        {
-        case ftInteger: {
-                        long long valInt = sqlLongLong(extraFields[ix]);
-                        printf("<td>%lld</td></tr>\n", valInt);
-                        }
-                        break;
-        case ftFloat:   {
-                        double valDouble = sqlDouble(extraFields[ix]);
-                        printf("<td>%g</td></tr>\n", valDouble);
-                        }
-                        break;
-        default:
-                        printf("<td>%s</td></tr>\n", extraFields[ix]);
-                        break;
-        }
-    }
-extraFieldsFree(&extras);
-
-if(ix > 0)
-    printf("</table>\n");
-
-return ix;
-}
-
 static void bigBedClick(char *fileName, struct trackDb *tdb,
 		     char *item, int start, int bedSize)
 /* Handle click in generic bigBed track. */
 {
 boolean showUrl = FALSE;
 char *chrom = cartString(cart, "c");
 
 /* Open BigWig file and get interval list. */
 struct bbiFile *bbi = bigBedFileOpen(fileName);
 struct lm *lm = lmInit(0);
 struct bigBedInterval *bbList = bigBedIntervalQuery(bbi, chrom, winStart, winEnd, 0, lm);
 
 /* Get bedSize if it's not already defined. */
 if (bedSize == 0)
     {
     bedSize = bbi->definedFieldCount;
     showUrl = TRUE;
     }
 
 /* Find particular item in list - matching start, and item if possible. */
 struct bigBedInterval *bbMatch = NULL, *bb;
 for (bb = bbList; bb != NULL; bb = bb->next)
     {
     if (bb->start == start)
         {
 	if (bedSize > 3)
 	    {
 	    char *name = cloneFirstWordInLine(bb->rest);
 	    boolean match = sameString(name, item);
 	    freez(&name);
 	    if (match)
 	        {
 		bbMatch = bb;
 		break;
 		}
 	    }
 	else
 	    {
 	    bbMatch = bb;
 	    break;
 	    }
 	}
     }
 
 if (bbMatch != NULL)
     {
     int seq1Seq2Fields = 0;
     // check for seq1 and seq2 in columns 7+8 (eg, pairedTagAlign)
     boolean seq1Seq2 = sameOk(trackDbSetting(tdb, BASE_COLOR_USE_SEQUENCE), "seq1Seq2");
     if (seq1Seq2 && bedSize == 6)
 	seq1Seq2Fields = 2;
     char *fields[bedSize+seq1Seq2Fields];
     char startBuf[16], endBuf[16];
     char *rest = cloneString(bbMatch->rest);
     int bbFieldCount = bigBedIntervalToRow(bbMatch, chrom, startBuf, endBuf, fields,
 					   bedSize+seq1Seq2Fields);
     if (bbFieldCount != bedSize+seq1Seq2Fields)
         {
 	errAbort("Disagreement between trackDb field count (%d) and %s fieldCount (%d)",
 		bedSize, fileName, bbFieldCount);
 	}
     struct bed *bed = bedLoadN(fields, bedSize);
     if (showUrl && (bedSize >= 4))
 	printCustomUrl(tdb, item, TRUE);
     bedPrintPos(bed, bedSize, tdb);
 
     // display seq1 and seq2
     if (seq1Seq2 && bedSize+seq1Seq2Fields == 8)
         printf("<table><tr><th>Sequence 1</th><th>Sequence 2</th></tr>"
 	       "<tr><td> %s </td><td> %s </td></tr></table>", fields[6], fields[7]);
     else if (isNotEmpty(rest))
 	{
 	char *restFields[256];
 	int restCount = chopTabs(rest, restFields);
 	int restBedFields = bedSize - 3;
 	if (restCount > restBedFields)
 	    {
-            if (0 == bigBedExtraFieldsPrint(tdb, restFields + restBedFields,restCount - restBedFields))
+            if (0 == extraFieldsPrint(tdb,NULL,restFields + restBedFields,restCount - restBedFields))
                 {
                 int i;
                 char label[20];
                 safef(label, sizeof(label), "nonBedFieldsLabel");
                 printf("<B>%s&nbsp;</B>",
                 trackDbSettingOrDefault(tdb, label, "Non-BED fields:"));
                 for (i = restBedFields;  i < restCount;  i++)
                     printf("%s%s", (i > 0 ? "\t" : ""), restFields[i]);
                 printf("<BR>\n");
                 }
 	    }
 	}
     if (isCustomTrack(tdb->track))
 	{
 	time_t timep = bbiUpdateTime(bbi);
 	printBbiUpdateTime(&timep);
 	}
     }
 else
     {
     printf("No item %s starting at %d\n", emptyForNull(item), start);
     }
 
 lmCleanup(&lm);
 bbiFileClose(&bbi);
 }
 
 void genericBigBedClick(struct sqlConnection *conn, struct trackDb *tdb,
 		     char *item, int start, int bedSize)
 /* Handle click in generic bigBed track. */
 {
 char *fileName = bbiNameFromSettingOrTable(tdb, conn, tdb->table);
 bigBedClick(fileName, tdb, item, start, bedSize);
 }
 
 void bigBedCustomClick(struct trackDb *tdb)
 /* Display details for BigWig custom tracks. */
 {
 char *fileName = trackDbSetting(tdb, "bigDataUrl");
 char *item = cartOptionalString(cart, "i");
 int start = cartInt(cart, "o");
 bigBedClick(fileName, tdb, item, start, 0);
 }