dba70a3c0e26923613996b0149fba257b11fd5c0 giardine Wed Dec 8 07:18:30 2010 -0800 Some missed changes to allow for variome belonging to a subcategory in the wiki diff --git src/hg/hgc/wikiTrack.c src/hg/hgc/wikiTrack.c index f8c6e1f..686bec1 100644 --- src/hg/hgc/wikiTrack.c +++ src/hg/hgc/wikiTrack.c @@ -428,31 +428,31 @@ /* this may be a multiple loci gene symbol annotation */ struct bed *itemList = multipleItems(item); char comments[1024]; if (slCount(itemList) > 0) safef(comments,ArraySize(comments), "This item '''%s''' on assembly %s " "at %s:%d-%d (and %d other loci) has been deleted from the wiki track\n\n", item->name, item->db, item->chrom, item->chromStart, item->chromEnd, slCount(itemList)); else safef(comments,ArraySize(comments), "This item '''%s''' on assembly %s " "at %s:%d-%d has been deleted from the wiki track\n\n", item->name, item->db, item->chrom, item->chromStart, item->chromEnd); prefixComments(item, comments, userName, seqName, winStart, winEnd, - database, NULL, "(deleted item)"); + database, NULL, "(deleted item)", NEW_ITEM_CATEGORY); deleteItem(sqlSigned(wikiItemId)); /* this may be a multiple loci gene symbol annotation */ if (slCount(itemList) > 0) { struct bed *el; for (el = itemList; el; el = el->next) deleteItem(el->score); } hPrintf("
\n"); hPrintf("
", hgTracksName()); cgiMakeButton("submit", "return to tracks display"); hPrintf("\n
\n"); hPrintf("
\n"); webIncludeHelpFile("wikiTrack", TRUE); } @@ -460,31 +460,31 @@ void doAddWikiComments(char *wikiItemId, char *chrom, int winStart, int winEnd) /* handle add comment item clicks for wikiTrack */ { char *userName = NULL; struct wikiTrack *item = findWikiItemId(wikiItemId); cartWebStart(cart, database, "%s (%s)", "User Annotation Track", item->name); if (NULL == wikiItemId) errAbort("add wiki comments: NULL wikiItemId"); if (! wikiTrackEnabled(database, &userName)) errAbort("add wiki comments: wiki track not enabled"); if (NULL == userName) errAbort("add wiki comments: user not logged in ?"); addDescription(item, userName, seqName, winStart, winEnd, cart, database, NULL, - NULL); + NULL, NEW_ITEM_CATEGORY); updateLastModifiedDate(sqlSigned(wikiItemId)); displayItem(item, userName); } void doCreateWikiItem(char *itemName, char *chrom, int winStart, int winEnd) /* handle create item clicks for wikiTrack */ { int itemStart = 0; int itemEnd = 0; char *chrName = NULL; char *pos = NULL; char *strand = cartUsualString(cart, NEW_ITEM_STRAND, "plus"); char *class = cartUsualString(cart, NEW_ITEM_CLASS, ITEM_NOT_CLASSIFIED); boolean plusStrand = sameWord("plus",strand) ? TRUE : FALSE; char descriptionKey[256]; @@ -565,18 +565,18 @@ safef(newItemName, ArraySize(newItemName), "%s", itemName); safef(query, ArraySize(query), "UPDATE %s set creationDate=now(),lastModifiedDate=now(),descriptionKey='%s' WHERE id='%d'", WIKI_TRACK_TABLE, descriptionKey, id); } sqlUpdate(wikiConn,query); wikiDisconnect(&wikiConn); cartWebStart(cart, database, "%s %s", "User Annotation Track, created new item: ", newItemName); char wikiItemId[64]; safef(wikiItemId,ArraySize(wikiItemId),"%d", id); struct wikiTrack *item = findWikiItemId(wikiItemId); addDescription(item, userName, seqName, winStart, winEnd, cart, database, NULL, - NULL); + NULL, NEW_ITEM_CATEGORY); displayItem(item, userName); } /* void doCreateWikiItem() */