b87966ef79a5c54ed61f83bc59233f1628cd7ac7
kate
  Wed Sep 26 17:02:49 2018 -0700
More click support for merged interactions. refs #21917

diff --git src/hg/hgc/interactClick.c src/hg/hgc/interactClick.c
index 89c90b6..2dcbfca 100644
--- src/hg/hgc/interactClick.c
+++ src/hg/hgc/interactClick.c
@@ -127,31 +127,31 @@
 }
 
 static struct interactPlusRow *getInteractions(struct trackDb *tdb, char *chrom, 
                                                 int start, int end, char *name, char *foot)
 /* Retrieve interact items at this position or name. 
  * Also any others with the same endpoint, if endpoint clicked on*/
 {
 struct interactPlusRow *iprs = NULL;
 char *file = trackDbSetting(tdb, "bigDataUrl");
 char *mergeMode = interactUiMergeMode(cart, tdb->track, tdb);
 if (file != NULL)
     iprs = getInteractsFromFile(file, chrom, start, end, name, mergeMode, foot);
 else
     iprs = getInteractsFromTable(tdb, chrom, start, end, name, mergeMode, foot);
 
-// TODO: add sort on score in interacts in ipr
+// TODO: add sort on score, or position for merged items ?
 //slSort(&inters, bedCmpScore);
 //slReverse(&inters);
 return iprs;
 }
 
 void doInteractRegionDetails(struct trackDb *tdb, struct interact *inter)
 {
 /* print info for both regions */
 /* Use different labels:
         1) directional (source/target)
         2) non-directional same chrom (lower/upper)
         3) non-directional other chrom (this/other)
 */
 char startBuf[1024], endBuf[1024], sizeBuf[1024];
 printf("<b>Interaction region:</b> ");
@@ -192,40 +192,42 @@
         region2Label = "Other";
         }
     else
         {
         region1Label = "Lower";
         region2Label = "Upper";
         }
     }
 // format and print
 sprintLongWithCommas(startBuf, region1Start + 1);
 sprintLongWithCommas(endBuf, region1End);
 sprintLongWithCommas(sizeBuf, region1End - region1Start);
 printf("<b>%s region:</b> %s&nbsp;&nbsp;"
                 "<a href='hgTracks?position=%s:%d-%d' target='_blank'>%s:%s-%s</a> %s",
                 region1Label, region1Name, region1Chrom, region1Start+1, region1End,
-                region1Chrom, startBuf, endBuf, inter->sourceStrand[0] == '.' ? "" : inter->sourceStrand);
+                region1Chrom, startBuf, endBuf, 
+                inter->sourceStrand[0] == '.' ? "" : inter->sourceStrand);
 printf("&nbsp;&nbsp;%s bp<br>\n", sizeBuf);
 
 sprintLongWithCommas(startBuf, region2Start+1);
 sprintLongWithCommas(endBuf, region2End);
 sprintLongWithCommas(sizeBuf, region2End - region2Start);
 printf("<b>%s region:</b> %s&nbsp;&nbsp;"
                 "<a href='hgTracks?position=%s:%d-%d' target='_blank'>%s:%s-%s</a> %s",
                 region2Label, region2Name, region2Chrom, region2Start+1, region2End,
-                region2Chrom, startBuf, endBuf, inter->targetStrand[0] == '.' ? "" : inter->targetStrand);
+                region2Chrom, startBuf, endBuf, 
+                inter->targetStrand[0] == '.' ? "" : inter->targetStrand);
 printf("&nbsp;&nbsp;%s bp<br>\n", sizeBuf);
 int distance = interactRegionDistance(inter);
 if (distance > 0)
     {
     // same chrom
     sprintLongWithCommas(sizeBuf, distance);
     printf("<b>Distance between midpoints:</b> %s bp<br>\n", sizeBuf); 
     }
 
 #ifdef TODO /* TODO: get count and score stats of all interactions in window ?*/
 double *scores;
 AllocArray(scores, count);
 #endif
 }
 
@@ -250,31 +252,42 @@
 void doInteractDetails(struct trackDb *tdb, char *item)
 /* Details of interaction items */
 {
 char *chrom = cartString(cart, "c");
 int start = cartInt(cart, "o");
 int end = cartInt(cart, "t");
 char *foot = cartOptionalString(cart, "foot");
 struct interactPlusRow *iprs = getInteractions(tdb, chrom, start, end, item, foot);
 if (iprs == NULL)
     errAbort("Can't find interaction %s", item ? item : "");
 int count = slCount(iprs);
 char *mergeMode = interactUiMergeMode(cart, tdb->track, tdb);
 if (count > 1)
     {
     printf("<b>Interactions:</b> %d<p>", count);
-    if (!mergeMode)
+    if (mergeMode)
+        {
+        char startBuf[1024], endBuf[1024], sizeBuf[1024];
+        sprintLongWithCommas(startBuf, start + 1);
+        sprintLongWithCommas(endBuf, end);
+        sprintLongWithCommas(sizeBuf, end - start);
+        printf("<b>%s interactions region:</b> &nbsp;&nbsp;"
+                        "<a href='hgTracks?position=%s:%d-%d' target='_blank'>%s:%s-%s</a> ",
+                        item, chrom, start+1, end, chrom, startBuf, endBuf);
+        printf("&nbsp;&nbsp;%s bp<br>\n", sizeBuf);
+        }
+    else
         doInteractRegionDetails(tdb, iprs->interact);
     printf("</p>");
     }
 genericHeader(tdb, item);
 static struct interactPlusRow *ipr = NULL;
 for (ipr = iprs; ipr != NULL; ipr = ipr->next)
     {
     if (count > 1)
         printf("<hr>\n");
     if (mergeMode)
         doInteractRegionDetails(tdb, ipr->interact);
     else
         doInteractItemDetails(tdb, ipr, item, count > 1);
     if (count > 1 && !isEmptyTextField(ipr->interact->name) && sameString(ipr->interact->name, item))
         printf("<hr>\n");