b77b6f5e5775c0b19238d66279c8e2a373ddce8d hiram Thu Jul 24 09:44:46 2014 -0700 eliminating the description field and named as rmskJoinedBaseline for table browser recognition in tableDescriptions refs #9741 diff --git src/hg/lib/rmskJoined.c src/hg/lib/rmskJoined.c index 998a4d9..8474e34 100644 --- src/hg/lib/rmskJoined.c +++ src/hg/lib/rmskJoined.c @@ -28,31 +28,30 @@ safecpy(ret->strand, sizeof(ret->strand), row[5]); ret->alignStart = sqlUnsigned(row[6]); ret->alignEnd = sqlUnsigned(row[7]); ret->reserved = sqlUnsigned(row[8]); { int sizeOne; sqlSignedDynamicArray(row[10], &ret->blockSizes, &sizeOne); assert(sizeOne == ret->blockCount); } { int sizeOne; sqlSignedDynamicArray(row[11], &ret->blockRelStarts, &sizeOne); assert(sizeOne == ret->blockCount); } ret->id = cloneString(row[12]); -// ret->description = cloneString(row[13]); return ret; } struct rmskJoined *rmskJoinedLoadAll(char *fileName) /* Load all rmskJoined from a whitespace-separated file. * Dispose of this with rmskJoinedFreeList(). */ { struct rmskJoined *list = NULL, *el; struct lineFile *lf = lineFileOpen(fileName, TRUE); char *row[14]; while (lineFileRow(lf, row)) { el = rmskJoinedLoad(row); slAddHead(&list, el); @@ -110,48 +109,46 @@ s = sqlEatChar(s, '}'); s = sqlEatChar(s, ','); } { int i; s = sqlEatChar(s, '{'); AllocArray(ret->blockRelStarts, ret->blockCount); for (i=0; iblockCount; ++i) { ret->blockRelStarts[i] = sqlSignedComma(&s); } s = sqlEatChar(s, '}'); s = sqlEatChar(s, ','); } ret->id = sqlStringComma(&s); -ret->description = sqlStringComma(&s); *pS = s; return ret; } void rmskJoinedFree(struct rmskJoined **pEl) /* Free a single dynamically allocated rmskJoined such as created * with rmskJoinedLoad(). */ { struct rmskJoined *el; if ((el = *pEl) == NULL) return; freeMem(el->chrom); freeMem(el->name); freeMem(el->blockSizes); freeMem(el->blockRelStarts); freeMem(el->id); -freeMem(el->description); freez(pEl); } void rmskJoinedFreeList(struct rmskJoined **pList) /* Free a list of dynamically allocated rmskJoined's */ { struct rmskJoined *el, *next; for (el = *pList; el != NULL; el = next) { next = el->next; rmskJoinedFree(&el); } *pList = NULL; } @@ -200,21 +197,19 @@ int i; if (sep == ',') fputc('{',f); for (i=0; iblockCount; ++i) { fprintf(f, "%d", el->blockRelStarts[i]); fputc(',', f); } if (sep == ',') fputc('}',f); } fputc(sep,f); if (sep == ',') fputc('"',f); fprintf(f, "%s", el->id); if (sep == ',') fputc('"',f); fputc(sep,f); if (sep == ',') fputc('"',f); -fprintf(f, "%s", el->description); -if (sep == ',') fputc('"',f); fputc(lastSep,f); } /* -------------------------------- End autoSql Generated Code -------------------------------- */