966e2c59c1b50f5966891310dcbc2055750867d3 max Fri Apr 13 14:51:20 2012 -0700 fixed indentation after larrym comments diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 9af5545..c262455 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -12300,32 +12300,30 @@ } hFreeConn(&conn); } #define PUBSFILTERNAME "pubsFilterArticleId" static void activatePslTrackIfCgi(struct track *tg) /* the publications hgc creates links back to the browser with * the cgi param pubsFilterArticleId to show only a single type * of feature for the pubsBlatPsl track. * If the parameter was supplied, we save this parameter here * into the cart and activate the track. */ { char *articleId = cgiOptionalString(PUBSFILTERNAME); -//if (articleId==NULL) - //articleId = cartOptionalString(cart, PUBSFILTERNAME); if (articleId!=NULL) { cartSetString(cart, PUBSFILTERNAME, articleId); tdbSetCartVisibility(tg->tdb, cart, hCarefulTrackOpenVis(database, tg->track)); tg->visibility=tvPack; } } char *pubsItemName(struct track *tg, void *item) /* get author/year from extra field */ { struct linkedFeatures *lf = item; pubsAddExtra(tg, lf); @@ -12348,34 +12346,31 @@ pubsAddExtra(tg, lf); struct pubsExtra* extra = lf->extra; char* mouseOver = NULL; if (extra != NULL) mouseOver = extra->mouseOver; else mouseOver = itemName; mapBoxHc(hvg, start, end, x, y, width, height, tg->track, mapItemName, mouseOver); } } static void pubsLoadMarkerItem (struct track *tg) /* copy item names into extra field */ { -//loadSimpleBed(tg); loadSimpleBedAsLinkedFeaturesPerBase(tg); -//tg->items = simpleBedListToLinkedFeatures(tg->items, tg->bedSize, TRUE, FALSE); -//if (! (hashFindVal(tdb->settingsHash, "pubsMarkerTable"))) enum trackVisibility vis = tg->visibility; if (vis == tvDense || vis == tvSquish) return; struct linkedFeatures *lf = NULL; for (lf = tg->items; lf != NULL; lf = lf->next) lf->extra = lf->name; } char *pubsMarkerItemName(struct track *tg, void *item) /* retrieve article count from score field and return.*/ { struct linkedFeatures *lf = item; char newName[64]; safef(newName, sizeof(newName), "%d articles", (int) lf->score);