61183752129e58c44ddfad7126cbb908c01f3965 braney Sat Feb 11 09:06:32 2017 -0800 remove some duplicated code diff --git src/webBlat/webBlat.c src/webBlat/webBlat.c index aa91238..a7abfdc 100644 --- src/webBlat/webBlat.c +++ src/webBlat/webBlat.c @@ -54,75 +54,30 @@ char *sortMenu[] = {"query,score", "query,start", "chrom,score", "chrom,start", "score"}; char *outputMenu[] = {"hyperlink", "psl", "psl no header"}; boolean isTxType(char *type) /* Return TRUE if it's a query requiring a translated server type */ { int i; for (i=0; i<ArraySize(protQueryMenu); ++i) { if (sameWord(type, protQueryMenu[i])) return TRUE; } return FALSE; } -int cmpSeqName(char *a, char *b) -/* Compare two sequence names likely to be of form prefix followed by a number. */ -{ -char cA, cB; -int cSame = countSame(a, b); - -a += cSame; -b += cSame; -cA = *a; -cB = *b; -if (isdigit(cA)) - { - if (isdigit(cB)) - return atoi(a) - atoi(b); - else - return -1; - } -else if (isdigit(cB)) - return 1; -else - return strcmp(a, b); -} - -int pslCmpTargetScore(const void *va, const void *vb) -/* Compare to sort based on target then score. */ -{ -const struct psl *a = *((struct psl **)va); -const struct psl *b = *((struct psl **)vb); -int diff = cmpSeqName(a->tName, b->tName); -if (diff == 0) - diff = pslScore(b) - pslScore(a); -return diff; -} - -int pslCmpTargetStart(const void *va, const void *vb) -/* Compare to sort based on target start. */ -{ -const struct psl *a = *((struct psl **)va); -const struct psl *b = *((struct psl **)vb); -int diff = cmpSeqName(a->tName, b->tName); -if (diff == 0) - diff = a->tStart - b->tStart; -return diff; -} - char *skipFile(char *fileSeq) /* Skip over file: */ { char *s = strchr(fileSeq, ':'); if (s != NULL) return s+1; else { internalErr(); return fileSeq; } } void parseFileSeq(char *spec, char **retFile, char **retSeq) /* Parse out file:seq into file and seq. */