82c4da4047101ecc794214c6d630e14e52c06fa8 markd Sun Apr 16 13:40:42 2017 -0700 fixed incorrect documentation in bigTransMap; gave one field a more meaninful name diff --git src/hg/lib/bigTransMap.c src/hg/lib/bigTransMap.c index 12de08c..4a0c28a 100644 --- src/hg/lib/bigTransMap.c +++ src/hg/lib/bigTransMap.c @@ -1,28 +1,28 @@ /* bigTransMap.c was originally generated by the autoSql program, which also * generated bigTransMap.h and bigTransMap.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 "bigTransMap.h" -char *bigTransMapCommaSepFieldNames = "chrom,chromStart,chromEnd,name,score,strand,thickStart,thickEnd,reserved,blockCount,blockSizes,chromStarts,oChromStart,oChromEnd,oStrand,oChromSize,oChromStarts,oSequence,oCDS,chromSize,match,misMatch,repMatch,nCount,seqType,srcDb,srcTransId,srcChrom,srcChromStart,srcChromEnd,srcScore,srcAligned,geneName,geneId,geneType,transcriptType,chainType,commonName,scientificName,orgAbbrev"; +char *bigTransMapCommaSepFieldNames = "chrom,chromStart,chromEnd,name,score,strand,thickStart,thickEnd,reserved,blockCount,blockSizes,chromStarts,oChromStart,oChromEnd,oStrand,oChromSize,oChromStarts,oSequence,oCDS,chromSize,match,misMatch,repMatch,nCount,seqType,srcDb,srcTransId,srcChrom,srcChromStart,srcChromEnd,srcIdent,srcAligned,geneName,geneId,geneType,transcriptType,chainType,commonName,scientificName,orgAbbrev"; struct bigTransMap *bigTransMapLoad(char **row) /* Load a bigTransMap from row fetched with select * from bigTransMap * from database. Dispose of this with bigTransMapFree(). */ { struct bigTransMap *ret; AllocVar(ret); ret->blockCount = sqlSigned(row[9]); ret->chrom = cloneString(row[0]); ret->chromStart = sqlUnsigned(row[1]); ret->chromEnd = sqlUnsigned(row[2]); ret->name = cloneString(row[3]); ret->score = sqlUnsigned(row[4]); safecpy(ret->strand, sizeof(ret->strand), row[5]); @@ -49,31 +49,31 @@ assert(sizeOne == ret->blockCount); } ret->oSequence = cloneString(row[17]); ret->oCDS = cloneString(row[18]); ret->chromSize = sqlUnsigned(row[19]); ret->match = sqlUnsigned(row[20]); ret->misMatch = sqlUnsigned(row[21]); ret->repMatch = sqlUnsigned(row[22]); ret->nCount = sqlUnsigned(row[23]); ret->seqType = sqlUnsigned(row[24]); ret->srcDb = cloneString(row[25]); ret->srcTransId = cloneString(row[26]); ret->srcChrom = cloneString(row[27]); ret->srcChromStart = sqlUnsigned(row[28]); ret->srcChromEnd = sqlUnsigned(row[29]); -ret->srcScore = sqlUnsigned(row[30]); +ret->srcIdent = sqlUnsigned(row[30]); ret->srcAligned = sqlUnsigned(row[31]); ret->geneName = cloneString(row[32]); ret->geneId = cloneString(row[33]); ret->geneType = cloneString(row[34]); ret->transcriptType = cloneString(row[35]); ret->chainType = cloneString(row[36]); ret->commonName = cloneString(row[37]); ret->scientificName = cloneString(row[38]); ret->orgAbbrev = cloneString(row[39]); return ret; } struct bigTransMap *bigTransMapLoadAll(char *fileName) /* Load all bigTransMap from a whitespace-separated file. * Dispose of this with bigTransMapFreeList(). */ @@ -167,31 +167,31 @@ s = sqlEatChar(s, ','); } ret->oSequence = sqlStringComma(&s); ret->oCDS = sqlStringComma(&s); ret->chromSize = sqlUnsignedComma(&s); ret->match = sqlUnsignedComma(&s); ret->misMatch = sqlUnsignedComma(&s); ret->repMatch = sqlUnsignedComma(&s); ret->nCount = sqlUnsignedComma(&s); ret->seqType = sqlUnsignedComma(&s); ret->srcDb = sqlStringComma(&s); ret->srcTransId = sqlStringComma(&s); ret->srcChrom = sqlStringComma(&s); ret->srcChromStart = sqlUnsignedComma(&s); ret->srcChromEnd = sqlUnsignedComma(&s); -ret->srcScore = sqlUnsignedComma(&s); +ret->srcIdent = sqlUnsignedComma(&s); ret->srcAligned = sqlUnsignedComma(&s); ret->geneName = sqlStringComma(&s); ret->geneId = sqlStringComma(&s); ret->geneType = sqlStringComma(&s); ret->transcriptType = sqlStringComma(&s); ret->chainType = sqlStringComma(&s); ret->commonName = sqlStringComma(&s); ret->scientificName = sqlStringComma(&s); ret->orgAbbrev = sqlStringComma(&s); *pS = s; return ret; } void bigTransMapFree(struct bigTransMap **pEl) /* Free a single dynamically allocated bigTransMap such as created @@ -330,31 +330,31 @@ fprintf(f, "%s", el->srcDb); if (sep == ',') fputc('"',f); fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->srcTransId); if (sep == ',') fputc('"',f); fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->srcChrom); if (sep == ',') fputc('"',f); fputc(sep,f); fprintf(f, "%u", el->srcChromStart); fputc(sep,f); fprintf(f, "%u", el->srcChromEnd); fputc(sep,f); -fprintf(f, "%u", el->srcScore); +fprintf(f, "%u", el->srcIdent); fputc(sep,f); fprintf(f, "%u", el->srcAligned); fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->geneName); if (sep == ',') fputc('"',f); fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->geneId); if (sep == ',') fputc('"',f); fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->geneType); if (sep == ',') fputc('"',f); fputc(sep,f);