40de8c885e2b858fbc86fb95a5737e9af0d53d66 max Tue May 14 17:04:01 2013 -0700 changes according to code review #10813 diff --git src/hg/hgTracks/pubsTracks.c src/hg/hgTracks/pubsTracks.c index fdcfb4b..962bfd6 100644 --- src/hg/hgTracks/pubsTracks.c +++ src/hg/hgTracks/pubsTracks.c @@ -214,33 +214,32 @@ } } } sqlFreeResult(&sr); return extra; } static void pubsAddExtra(struct track* tg, struct linkedFeatures* lf) /* add authorYear and title to linkedFeatures->extra */ { char *articleTable = trackDbSettingClosestToHome(tg->tdb, "pubsArticleTable"); if(isEmpty(articleTable)) return; -if (lf->extra != NULL) { +if (lf->extra != NULL) return; - } struct sqlConnection *conn = hAllocConn(database); struct pubsExtra* extra = pubsMakeExtra(tg, articleTable, conn, lf); lf->extra = extra; hFreeConn(&conn); } static void dyStringPrintfWithSep(struct dyString *ds, char* sep, char *format, ...) /* Printf to end of dyString. Prefix with sep if dyString is not empty. */ { if (ds->stringSize!=0) dyStringAppend(ds, sep); va_list args; va_start(args, format); dyStringVaPrintf(ds, format, args); @@ -269,33 +268,33 @@ freeMem(keywords); slFreeList(artIds); return hashA; } static void pubsLoadKeywordYearItems(struct track *tg) /* load items that fulfill keyword and year filter */ { pubsParseClassColors(); struct sqlConnection *conn = hAllocConn(database); char *keywords = cartOptionalStringClosestToHome(cart, tg->tdb, FALSE, "pubsFilterKeywords"); char *yearFilter = cartOptionalStringClosestToHome(cart, tg->tdb, FALSE, "pubsFilterYear"); char *publFilter = cartOptionalStringClosestToHome(cart, tg->tdb, FALSE, "pubsFilterPublisher"); char *articleTable = pubsArticleTable(tg); -if(yearFilter == NULL || sameWord(yearFilter, "anytime")) +if(sameOk(yearFilter, "anytime")) yearFilter = NULL; -if(publFilter==NULL || sameWord(publFilter, "all")) +if(sameOk(publFilter, "all")) publFilter = NULL; if(isNotEmpty(keywords)) keywords = makeMysqlMatchStr(sqlEscapeString(keywords)); if (isEmpty(yearFilter) && isEmpty(keywords) && isEmpty(publFilter)) { loadGappedBed(tg); } else { char* oldLabel = tg->longLabel; tg->longLabel = catTwoStrings(oldLabel, " (filter activated)"); freeMem(oldLabel);