8fb4027093f1cbffe03926a69f2022e92aa31f56 tdreszer Tue Nov 16 17:05:34 2010 -0800 Fix a couple of places broken by the use of [] as a placeholder for empty in an old cart var diff --git src/hg/hgGene/hgGene.c src/hg/hgGene/hgGene.c index 399eeff..68c73f2 100644 --- src/hg/hgGene/hgGene.c +++ src/hg/hgGene/hgGene.c @@ -516,31 +516,31 @@ * otherwise from database. */ { char *oldGene = hashFindVal(oldVars, hggGene); char *oldStarts = hashFindVal(oldVars, hggStart); char *oldEnds = hashFindVal(oldVars, hggEnd); char *newGene = curGeneId; char *newChrom = cartOptionalString(cart, hggChrom); char *newStarts = cartOptionalString(cart, hggStart); char *newEnds = cartOptionalString(cart, hggEnd); if (newChrom != NULL && !sameString(newChrom, "none") && newStarts != NULL && newEnds != NULL) { - if (oldGene == NULL || oldStarts == NULL || oldEnds == NULL + if (IS_CART_VAR_EMPTY(oldGene) == NULL || IS_CART_VAR_EMPTY(oldStarts) == NULL || IS_CART_VAR_EMPTY(oldEnds) == NULL || sameString(oldGene, newGene)) { curGeneChrom = newChrom; curGeneStart = atoi(newStarts); curGeneEnd = atoi(newEnds); return; } } /* If we made it to here we can't find/don't trust the cart position * info. We'll look it up from the database instead. */ { char *table = genomeSetting("knownGene"); char query[256]; struct sqlResult *sr;