0ede364a2dcb452681933d5a3579b4f05d90a245 markd Sun Jul 5 15:16:27 2020 -0700 fixed bug where totalSeqSize was not stored in index, now hgBlat works diff --git src/hg/lib/blatServers.c src/hg/lib/blatServers.c index e2fc619..d1c23ee 100644 --- src/hg/lib/blatServers.c +++ src/hg/lib/blatServers.c @@ -1,141 +1,146 @@ /* blatServers.c was originally generated by the autoSql program, which also * generated blatServers.h and blatServers.sql. This module links the database and * the RAM representation of objects. */ #include "common.h" #include "linefile.h" #include "dystring.h" #include "jksql.h" #include "blatServers.h" -char *blatServersCommaSepFieldNames = "db,host,port,isTrans,canPcr"; +char *blatServersCommaSepFieldNames = "db,host,port,isTrans,canPcr,dynamic"; void blatServersStaticLoad(char **row, struct blatServers *ret) /* Load a row from blatServers table into ret. The contents of ret will * be replaced at the next call to this function. */ { ret->db = row[0]; ret->host = row[1]; ret->port = sqlSigned(row[2]); ret->isTrans = sqlSigned(row[3]); ret->canPcr = sqlSigned(row[4]); +ret->dynamic = sqlSigned(row[5]); } struct blatServers *blatServersLoad(char **row) /* Load a blatServers from row fetched with select * from blatServers * from database. Dispose of this with blatServersFree(). */ { struct blatServers *ret; AllocVar(ret); ret->db = cloneString(row[0]); ret->host = cloneString(row[1]); ret->port = sqlSigned(row[2]); ret->isTrans = sqlSigned(row[3]); ret->canPcr = sqlSigned(row[4]); +ret->dynamic = sqlSigned(row[5]); return ret; } struct blatServers *blatServersLoadAll(char *fileName) /* Load all blatServers from a whitespace-separated file. * Dispose of this with blatServersFreeList(). */ { struct blatServers *list = NULL, *el; struct lineFile *lf = lineFileOpen(fileName, TRUE); -char *row[5]; +char *row[6]; while (lineFileRow(lf, row)) { el = blatServersLoad(row); slAddHead(&list, el); } lineFileClose(&lf); slReverse(&list); return list; } struct blatServers *blatServersLoadAllByChar(char *fileName, char chopper) /* Load all blatServers from a chopper separated file. * Dispose of this with blatServersFreeList(). */ { struct blatServers *list = NULL, *el; struct lineFile *lf = lineFileOpen(fileName, TRUE); -char *row[5]; +char *row[6]; while (lineFileNextCharRow(lf, chopper, row, ArraySize(row))) { el = blatServersLoad(row); slAddHead(&list, el); } lineFileClose(&lf); slReverse(&list); return list; } struct blatServers *blatServersCommaIn(char **pS, struct blatServers *ret) /* Create a blatServers out of a comma separated string. * This will fill in ret if non-null, otherwise will * return a new blatServers */ { char *s = *pS; if (ret == NULL) AllocVar(ret); ret->db = sqlStringComma(&s); ret->host = sqlStringComma(&s); ret->port = sqlSignedComma(&s); ret->isTrans = sqlSignedComma(&s); ret->canPcr = sqlSignedComma(&s); +ret->dynamic = sqlSignedComma(&s); *pS = s; return ret; } void blatServersFree(struct blatServers **pEl) /* Free a single dynamically allocated blatServers such as created * with blatServersLoad(). */ { struct blatServers *el; if ((el = *pEl) == NULL) return; freeMem(el->db); freeMem(el->host); freez(pEl); } void blatServersFreeList(struct blatServers **pList) /* Free a list of dynamically allocated blatServers's */ { struct blatServers *el, *next; for (el = *pList; el != NULL; el = next) { next = el->next; blatServersFree(&el); } *pList = NULL; } void blatServersOutput(struct blatServers *el, FILE *f, char sep, char lastSep) /* Print out blatServers. Separate fields with sep. Follow last field with lastSep. */ { if (sep == ',') fputc('"',f); fprintf(f, "%s", el->db); if (sep == ',') fputc('"',f); fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->host); if (sep == ',') fputc('"',f); fputc(sep,f); fprintf(f, "%d", el->port); fputc(sep,f); fprintf(f, "%d", el->isTrans); fputc(sep,f); fprintf(f, "%d", el->canPcr); +fputc(sep,f); +fprintf(f, "%d", el->dynamic); fputc(lastSep,f); } /* -------------------------------- End autoSql Generated Code -------------------------------- */