95030f73f067d8e8f9221a09c1811784607e4e72 markd Fri Jul 10 17:51:29 2020 -0700 split dynamic server genomeDataPrefix into genome and genomeDataDir. More verbose, but clearer diff --git src/inc/genoFind.h src/inc/genoFind.h index afb94bf..1658872 100644 --- src/inc/genoFind.h +++ src/inc/genoFind.h @@ -347,45 +347,48 @@ /* Set up to catch broken pipe signals. */ int gfReadMulti(int sd, void *vBuf, size_t size); /* Read in until all is read or there is an error. */ /* --- Some routines for dealing with gfServer at a high level ---- */ struct hash *gfFileCacheNew(); /* Create hash for storing info on .nib and .2bit files. */ void gfFileCacheFree(struct hash **pCache); /* Free up resources in cache. */ void gfAlignStrand(int *pConn, char *nibDir, struct dnaSeq *seq, boolean isRc, int minMatch, - struct hash *tFileCache, struct gfOutput *out, char *dynGenomeDir); + struct hash *tFileCache, struct gfOutput *out, + char *genome, char *genomeDataDir); /* Search genome on server with one strand of other sequence to find homology. * Then load homologous bits of genome locally and do detailed alignment. * Call 'outFunction' with each alignment that is found. gfSavePsl is a handy * outFunction to use. */ void gfAlignTrans(int *pConn, char *nibDir, aaSeq *seq, - int minMatch, struct hash *tFileHash, struct gfOutput *out, char *dynGenomeDir); + int minMatch, struct hash *tFileHash, struct gfOutput *out, + char *genome, char *genomeDataDir); /* Search indexed translated genome on server with an amino acid sequence. * Then load homologous bits of genome locally and do detailed alignment. * Call 'outFunction' with each alignment that is found. */ void gfAlignTransTrans(int *pConn, char *nibDir, struct dnaSeq *seq, boolean qIsRc, int minMatch, struct hash *tFileCache, - struct gfOutput *out, boolean isRna, char *dynGenomeDir); + struct gfOutput *out, boolean isRna, + char *genome, char *genomeDataDir); /* Search indexed translated genome on server with an dna sequence. Translate * this sequence in three frames. Load homologous bits of genome locally * and do detailed alignment. Call 'outFunction' with each alignment * that is found. */ int gfMayConnect(char *hostName, char *portName); /* Set up our network connection to server, or return -1. */ int gfConnect(char *hostName, char *portName); /* Set up our network connection to server. Aborts on error. */ int gfDefaultRepMatch(int tileSize, int stepSize, boolean protTiles); /* Figure out appropriate step repMatch value. */ void gfMakeOoc(char *outName, char *files[], int fileCount,