68315931f4a9ec4272a8df76e6a881339717ac16
braney
Wed Jun 1 15:37:37 2016 -0700
changes to support longTabix files in hgIntegrator
diff --git src/hg/lib/longRange.c src/hg/lib/longRange.c
index 43e8f09..419fc92 100644
--- src/hg/lib/longRange.c
+++ src/hg/lib/longRange.c
@@ -1,44 +1,25 @@
/* longRange --- functions to provide UI for long range interaction
* graph. Functions to retrieve long range information from
* bedTabix format.
*/
/* Copyright (C) 2016 The Regents of the University of California
* * See README in this or parent directory for licensing information. */
#include "longRange.h"
-static char *longTabixAutoSqlString =
-"table longTabix\n"
-"\"Long Range Tabix file\"\n"
-" (\n"
-" string chrom; \"Reference sequence chromosome or scaffold\"\n"
-" uint chromStart; \"Start position in chromosome\"\n"
-" uint chromEnd; \"End position in chromosome\"\n"
-" string interactingRegion; \"(e.g. chrX:123-456,3.14, where chrX:123-456 is the coordinate of the mate, and 3.14 is the score of the interaction)\"\n"
-" uint id; \"Unique Id\"\n"
-" char[1] strand; \"+ or -\"\n"
-" )\n"
-;
-
-struct asObject *longTabixAsObj()
-// Return asObject describing fields of longTabix file
-{
-return asParseText(longTabixAutoSqlString);
-}
-
void longRangeCfgUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed)
/* Complete track controls for long range interaction. */
{
char buffer[1024];
safef(buffer, sizeof buffer, "%s.%s", tdb->track, LONG_HEIGHT );
unsigned height = sqlUnsigned(cartUsualString(cart, buffer, LONG_DEFHEIGHT));
printf("
Track height: ");
cgiMakeIntVar(buffer, height, 3);
safef(buffer, sizeof buffer, "%s.%s", tdb->track, LONG_MINSCORE);
double minScore = sqlDouble(cartUsualString(cart, buffer, LONG_DEFMINSCORE));
printf("
Minimum score: ");
cgiMakeDoubleVar(buffer, minScore, 0);
}
static char *getOther(struct bed *bed, unsigned *s, unsigned *e, double *score)