ebac221d908ccb1376f3af41ab85384363b2f73c tdreszer Mon Sep 19 10:30:28 2011 -0700 Larry pointed out my bad spelling in code review. No actual logic change here. diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c index c04fe23..8eafa54 100644 --- src/hg/lib/mdb.c +++ src/hg/lib/mdb.c @@ -1581,94 +1581,94 @@ // prints objs and var=val pairs as formatted metadata lines or ra style { mdbObjPrintToStream(mdbObjs, raStyle, stdout); } void mdbObjPrintToFile(struct mdbObj *mdbObjs,boolean raStyle, char *file) // prints (to file) objs and var=val pairs as formatted metadata lines or ra style { FILE *f = mustOpen(file, "w"); mdbObjPrintToStream(mdbObjs, raStyle, f); fclose(f); } -void mdbObjPrintOrderedToStream(FILE *outF,struct mdbObj **mdbObjs,char *order, char *seperator, boolean header) +void mdbObjPrintOrderedToStream(FILE *outF,struct mdbObj **mdbObjs,char *order, char *separator, boolean header) // prints mdbObjs as a table, but only the vars listed in comma delimited order. -// Examples of seperator: " " "\t\t" or "<TD>", in which case this is an HTML table. +// Examples of separator: " " "\t\t" or "<TD>", in which case this is an HTML table. // mdbObjs list will be reordered. Sort fails when vars are missing in objs. { -if (seperator == NULL) - seperator = " "; +if (separator == NULL) + separator = " "; boolean html = FALSE; -if (startsWith("<T",seperator) || startsWith("<t",seperator)) +if (startsWith("<T",separator) || startsWith("<t",separator)) { - if(!endsWith(seperator,">")) - errAbort("mdbObjPrintOrdered() seperator is invalid HTML '%s'.\n",seperator); + if(!endsWith(separator,">")) + errAbort("mdbObjPrintOrdered() separator is invalid HTML '%s'.\n",separator); html = TRUE; } if (!startsWithWordByDelimiter("obj" ,',',order) && !startsWithWordByDelimiter("objName" ,',',order) && !startsWithWordByDelimiter("metaObject",',',order)) mdbObjsSortOnVars(mdbObjs, order); struct slName *vars = slNameListFromString(order, ','); struct slName *var = NULL; if (html) fprintf(outF, "<table>"); if (header) { if (html) fprintf(outF, "<tr>"); for (var = vars;var != NULL; var = var->next) { if (html) - fprintf(outF, "%s%s",seperator,var->name); // <td> is first + fprintf(outF, "%s%s",separator,var->name); // <td> is first else - fprintf(outF, "%s%s",var->name,seperator); + fprintf(outF, "%s%s",var->name,separator); if (html) fprintf(outF, "</td>"); } if (html) fprintf(outF, "</tr>"); fprintf(outF, "\n"); } struct mdbObj *mdbObj = *mdbObjs; for (;mdbObj != NULL; mdbObj = mdbObj->next) { if (html) fprintf(outF, "<tr>"); for (var = vars;var != NULL; var = var->next) { char *val = mdbObjFindValue(mdbObj, var->name); if (val == NULL) { /*if (sameWord(var->name,"obj") || sameWord(var->name,"objName") || sameWord(var->name,"metaObject")) val = mdbObj->obj; else*/ if (html) val = " "; else val = " "; } if (html) - fprintf(outF, "%s%s",seperator,val); // <td> is first + fprintf(outF, "%s%s",separator,val); // <td> is first else - fprintf(outF, "%s%s",val,seperator); + fprintf(outF, "%s%s",val,separator); if (html) fprintf(outF, "</td>"); } if (html) fprintf(outF, "</tr>"); fprintf(outF, "\n"); } if (html) fprintf(outF, "</table>\n"); } int mdbObjPrintToTabFile(struct mdbObj *mdbObjs, char *file) // prints all objs as tab delimited obj var val into file for SQL LOAD DATA. Returns count. {