a4b45fbe8156dfa9881f586b830a2e6a6338d58f markd Wed Dec 9 11:35:20 2020 -0800 fixed undetect change in signature diff --git src/gfClient/gfClient.c src/gfClient/gfClient.c index f063af3..94942ec 100644 --- src/gfClient/gfClient.c +++ src/gfClient/gfClient.c @@ -100,63 +100,61 @@ { struct lineFile *lf = lineFileOpen(inName, TRUE); static bioSeq seq; FILE *out = mustOpen(outName, "w"); enum gfType qType = gfTypeFromName(qTypeName); enum gfType tType = gfTypeFromName(tTypeName); int dotMod = 0; char databaseName[256]; struct hash *tFileCache = gfFileCacheNew(); snprintf(databaseName, sizeof(databaseName), "%s:%s", hostName, portName); gvo = gfOutputAny(outputFormat, round(minIdentity*10), qType == gftProt, tType == gftProt, optionExists("nohead"), databaseName, 23, 3.0e9, minIdentity, out); gfOutputHead(gvo, out); -struct gfConnection *conn = gfConnect(hostName, portName, (genome != NULL)); +struct gfConnection *conn = gfConnect(hostName, portName, genome, genomeDataDir); while (faSomeSpeedReadNext(lf, &seq.dna, &seq.size, &seq.name, qType != gftProt)) { if (dots != 0) { if (++dotMod >= dots) { dotMod = 0; verboseDot(); } } if (qType == gftProt && (tType == gftDnaX || tType == gftRnaX)) { gvo->reportTargetStrand = TRUE; - gfAlignTrans(conn, tSeqDir, &seq, minScore, tFileCache, gvo, genome, genomeDataDir); + gfAlignTrans(conn, tSeqDir, &seq, minScore, tFileCache, gvo); } else if ((qType == gftRnaX || qType == gftDnaX) && (tType == gftDnaX || tType == gftRnaX)) { gvo->reportTargetStrand = TRUE; - gfAlignTransTrans(conn, tSeqDir, &seq, FALSE, minScore, tFileCache, - gvo, qType == gftRnaX, genome, genomeDataDir); + gfAlignTransTrans(conn, tSeqDir, &seq, FALSE, minScore, tFileCache, gvo, qType == gftRnaX); if (qType == gftDnaX) { reverseComplement(seq.dna, seq.size); - gfAlignTransTrans(conn, tSeqDir, &seq, TRUE, minScore, tFileCache, - gvo, FALSE, genome, genomeDataDir); + gfAlignTransTrans(conn, tSeqDir, &seq, TRUE, minScore, tFileCache, gvo, FALSE); } } else if ((tType == gftDna || tType == gftRna) && (qType == gftDna || qType == gftRna)) { - gfAlignStrand(conn, tSeqDir, &seq, FALSE, minScore, tFileCache, gvo, genome, genomeDataDir); + gfAlignStrand(conn, tSeqDir, &seq, FALSE, minScore, tFileCache, gvo); reverseComplement(seq.dna, seq.size); - gfAlignStrand(conn, tSeqDir, &seq, TRUE, minScore, tFileCache, gvo, genome, genomeDataDir); + gfAlignStrand(conn, tSeqDir, &seq, TRUE, minScore, tFileCache, gvo); } else { errAbort("Comparisons between %s queries and %s databases not yet supported", qTypeName, tTypeName); } gfOutputQuery(gvo, out); } gfDisconnect(&conn); if (out != stdout) printf("Output is in %s\n", outName); gfFileCacheFree(&tFileCache); }