73086ea873bdcfdf9f84bcf89a6b20419ac46936 max Tue Nov 19 16:32:54 2013 -0800 changes for a bing.com pubs track diff --git src/hg/hgTracks/pubsTracks.c src/hg/hgTracks/pubsTracks.c index d66f5ec..26923a1 100644 --- src/hg/hgTracks/pubsTracks.c +++ src/hg/hgTracks/pubsTracks.c @@ -95,49 +95,51 @@ rgb->b = (sqlUnsigned(rgbVals[2])); //printf("Adding hash: %s -> %d,%d,%d", class, rgb->r, rgb->g, rgb->b); hashAdd(pubsClassColors, cloneString(class), rgb); } sqlFreeResult(&sr); } static char *pubsFeatureLabel(char *author, char *year) /* create label <author><year> given authors and year strings */ { char *authorYear = NULL; if (isEmpty(author)) author = "NoAuthor"; if (isEmpty(year)) - year = "NoYear"; + year = ""; else if (sameWord(year, "0")) year = ""; authorYear = catTwoStrings(author, year); return authorYear; } static void setFormatFlag(struct sqlConnection* conn, char* tableName) /* We support two different storage places for article data: either the bed table directly * includes the title + author of the article or we have to look it up from the articles * table. Having a copy of the title in the bed table is faster * This function sets the flag to indicate the version we have in our table. * */ { if (seqTableFormat!=0) return; if (sqlColumnExists(conn, tableName, "title")) + { seqTableFormat = SEQTABLE_NEW; + } else seqTableFormat = SEQTABLE_OLD; } static struct pubsExtra *pubsMakeExtra(struct track* tg, char *articleTable, struct sqlConnection* conn, struct linkedFeatures* lf) /* bad solution: a function that is called before the extra field is * accessed and that fills it from a sql query. Will need to redo this like gencode, * drawing from atom, variome and bedLoadN or bedDetails */ { char query[LARGEBUF]; struct sqlResult *sr = NULL; char **row = NULL; struct pubsExtra *extra = NULL;