27263de199a7c1410afad10fcfc6bdee0dedfb2f braney Tue Feb 26 09:21:56 2013 -0800 some assembly hub fixes (non-chrom sequence dump, don't open db when not needed) #8072 diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index a0524fb..dbbe8ea 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -4038,30 +4038,31 @@ dyStringPrintf(url, "cmd=retrieve&size=1&val=%s&", traceId); dyStringAppend(url, "file=trace&dopt=trace"); return dyStringCannibalize(&url); } void doGetDna1() /* Do first get DNA dialog. */ { struct hTableInfo *hti = NULL; char *tbl = cgiUsualString("table", ""); if (dbIsFound) { char rootName[256]; char parsedChrom[32]; hParseTableName(database, tbl, rootName, parsedChrom); + if (!trackHubDatabase(database)) hti = hFindTableInfo(database, seqName, rootName); } char *thisOrg = hOrganism(database); cartWebStart(cart, database, "Get DNA in Window (%s/%s)", database, thisOrg); printf("<H2>Get DNA for </H2>\n"); printf("<FORM ACTION=\"%s\">\n\n", hgcName()); cartSaveSession(cart); cgiMakeHiddenVar("g", "htcGetDna2"); cgiMakeHiddenVar("table", tbl); cgiContinueHiddenVar("i"); cgiContinueHiddenVar("o"); cgiContinueHiddenVar("t"); cgiContinueHiddenVar("l"); cgiContinueHiddenVar("r"); puts("Position "); @@ -4619,30 +4620,31 @@ char parsedChrom[32]; /* use the values from the dnaPos dialog box */ if (!( NULL != (pos = stripCommas(cartOptionalString(cart, "getDnaPos"))) && hgParseChromRange(database, pos, &chrom, &start, &end))) { /* if can't get DnaPos from dialog box, use "o" and "t" */ start = cartInt(cart, "o"); end = cartInt(cart, "t"); } /* Table might be a custom track if it's not in the database, * or bigBed if it is in the database but has only one column called 'fileName'; * in which case, just get DNA as if no table were given. */ hParseTableName(database, tbl, rootName, parsedChrom); + if (!trackHubDatabase(database)) hti = hFindTableInfo(database, seqName, rootName); if (hti == NULL || hti->startField[0] == 0) { itemCount = 1; hgSeqRange(database, seqName, start, end, '?', tbl); } else { char *where = NULL; char *item = cgiUsualString("i", ""); char buf[256]; if ((hti->nameField[0] != 0) && (item[0] != 0)) { char *quotedItem = makeQuotedString(item, '\''); safef(buf, sizeof(buf), "%s = %s", hti->nameField, quotedItem);