ba33f2c600399d5b4b97dd5fd987ed2db3c891ba chmalee Tue May 19 13:40:42 2026 -0700 myVariants related fixes from code review. Standardize how the code determines we are about to do something myVariants related by #defining some strings and using sameOk to check for them, remove a dead code block, and have hgc use autoSql to load the myVariants item rather than check the raw sql result, refs #37528 diff --git src/hg/inc/myVariants.h src/hg/inc/myVariants.h index dc495e51eb6..a111711495b 100644 --- src/hg/inc/myVariants.h +++ src/hg/inc/myVariants.h @@ -1,30 +1,44 @@ #ifndef MYVARIANTS_H #define MYVARIANTS_H #include "jksql.h" #include "asParse.h" #include "common.h" #include "cart.h" #include "customTrack.h" #define MYVARIANTS_NUM_COLS 20 /* number of default columns before any user-added custom columns */ /* Cart var prefix that points at the on-disk myVariants ctfile for a given assembly. * Kept separate from CT_FILE_VAR_PREFIX so myVariants and regular custom tracks * coexist without clobbering each other. */ #define MYVARIANTS_FILE_VAR_PREFIX "mvCtfile_" +/* Track-name and type identifiers for myVariants custom tracks. */ +#define MYVARIANTS_TYPE "myVariants" +#define MYVARIANTS_TRACK_PREFIX "myVariants_" +#define MYVARIANTS_SHARED_TRACK_PREFIX "myVariants_shared_" + +boolean isMyVariantsType(char *type); +/* TRUE if type names the myVariants custom-track type. NULL-safe. */ + +boolean isMyVariantsTrack(char *trackName); +/* TRUE if trackName is a myVariants custom track (own or shared). NULL-safe. */ + +boolean isMyVariantsSharedTrack(char *trackName); +/* TRUE if trackName is a myVariants shared custom track. NULL-safe. */ + struct myVariants /* An item in a myVariants type track. */ { struct myVariants *next; /* Next in singly linked list. */ unsigned bin; /* Bin for range index */ char *chrom; /* Reference sequence chromosome or scaffold */ unsigned chromStart; /* Start position in chromosome */ unsigned chromEnd; /* End position in chromosome */ char *name; /* Name of item - up to 16 chars */ unsigned score; /* 0-1000. Higher numbers are darker. */ char strand[2]; /* + or - for strand */ unsigned thickStart; /* Start of thick part */ unsigned thickEnd; /* End position of thick part */ unsigned itemRgb; /* RGB 8 bits each as in bed */ unsigned blockCount; /* Number of blocks */