945197799e507e8fb1d9365b822c9c1a46d3799c angie Tue Feb 12 11:21:24 2019 -0800 Undoing overzealous removal of chrNameCmpWithAltRandom from hdb.h, just before it was needed elsewhere. diff --git src/hg/inc/hdb.h src/hg/inc/hdb.h index 0318b45..3e4d72c 100644 --- src/hg/inc/hdb.h +++ src/hg/inc/hdb.h @@ -905,30 +905,41 @@ * exception cuz we're nice */ int chrStrippedCmp(char *chrA, char *chrB); /* compare chrom names after stripping chr, Scaffold_ or ps_ prefix */ int chrNameCmp(char *str1, char *str2); /* Compare chromosome names by number, then suffix. str1 and str2 must * match the regex "chr([0-9]+|[A-Za-z0-9]+)(_[A-Za-z0-9_]+)?". */ int chrSlNameCmp(const void *el1, const void *el2); /* Compare chromosome names by number, then suffix. el1 and el2 must be * slName **s (as passed in by slSort) whose names match the regex * "chr([0-9]+|[A-Za-z0-9]+)(_[A-Za-z0-9_]+)?". */ +int chrNameCmpWithAltRandom(char *str1, char *str2); +/* Compare chromosome or linkage group names str1 and str2 + * to achieve this order: + * chr1 .. chr22 + * chrX + * chrY + * chrM + * chr1_{alt,fix,hap*,random} .. chr22_{alt,fix,hap*,random} + * chrUns + */ + int chrSlNameCmpWithAltRandom(const void *el1, const void *el2); /* Compare chromosome or linkage group names str1 and str2 * to achieve this order: * chr1 .. chr22 * chrX * chrY * chrM * chr1_{alt,fix,hap*,random} .. chr22_{alt,fix,hap*,random} * chrUn* */ int bedCmpExtendedChr(const void *va, const void *vb); /* Compare to sort based on chrom,chromStart. Use extended * chrom name comparison, that strip prefixes and does numeric compare */