src/hg/hgTracks/wiki.c 1.3

1.3 2010/05/11 01:43:28 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/hgTracks/wiki.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/wiki.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -B -U 1000000 -r1.2 -r1.3
--- src/hg/hgTracks/wiki.c	3 Sep 2008 19:19:06 -0000	1.2
+++ src/hg/hgTracks/wiki.c	11 May 2010 01:43:28 -0000	1.3
@@ -1,69 +1,69 @@
 #include "common.h"
 #include "jksql.h"
 #include "hgTracks.h"
 #include "rnaPLFoldTrack.h"
 
 /* ------ BEGIN wiki ------ */
 
 /*******************************************************************/
 
 #define MAX_WIKI_NAME 80
 
 void loadWiki(struct track *tg);
 
 
 void loadWiki(struct track *tg)
 /* Load the items in one custom track - just move beds in
  * window... */
 {
 struct bed *bed, *list = NULL;
 struct sqlConnection *conn = hAllocConn(database);
 struct sqlResult *sr;
 char **row;
 int rowOffset;
 
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     bed = bedLoadN(row+rowOffset, 6);
     freeMem(bed->name);
     bed->name = malloc(MAX_WIKI_NAME);
     snprintf(bed->name, MAX_WIKI_NAME, "%d-%d:%s", bed->chromStart, bed->chromEnd, bed->strand);
     slAddHead(&list, bed);
     }
 sqlFreeResult(&sr);
 hFreeConn(&conn);
 //slReverse(&list);
 
 // add dummy links
 AllocVar(bed);
 bed->chrom = chromName;
 bed->chromStart = winStart;
 bed->chromEnd = winEnd;
 bed->name = "Make new entry:+";
 bed->strand[0] = '+';
 bed->score = 100;
 slAddHead(&list, bed);
 
 AllocVar(bed);
 bed->chrom = chromName;
 bed->chromStart = winStart;
 bed->chromEnd = winEnd;
 bed->name = "Make new entry:-";
 bed->strand[0] = '-';
 bed->score = 100;
 slAddHead(&list, bed);
 
 tg->items = list;
 }
 
 
 void wikiMethods(struct track *tg)
 {
   //linkedFeaturesMethods(tg);
 tg->loadItems = loadWiki;
 //tg->colorShades = shadesOfGray;
 //tg->drawItemAt = tigrOperonDrawAt;
 }
 
 /**** End of Lowe lab additions ****/