3cbc3345fa132a7276f6118398c5601764d38821 chinhli Wed Nov 14 13:37:47 2012 -0800 Code Review #9591: combined duplicated blocks of code in numtsClick.c diff --git src/hg/hgc/numtsClick.c src/hg/hgc/numtsClick.c index fe84d1f..24a12c4 100644 --- src/hg/hgc/numtsClick.c +++ src/hg/hgc/numtsClick.c @@ -35,41 +35,31 @@ safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand from %s where name='%s'", table, itemName); sr = sqlGetResult(conn, query); int sSize=0; while ((row = sqlNextRow(sr)) != NULL) { bed = bedLoad6(row); sSize = bed->chromEnd - bed->chromStart; /* printf("sSize is: %5d <BR>", sSize); */ } if (sameString("hg18", database)) { - if (sameString("numtS", table)) - { - safef(query, sizeof(query), - "select chrom, chromStart, chromEnd, name, score, strand " - "from numtSMitochondrionChrPlacement where ( " - "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND " - " (ABS((chromEnd - chromStart)-%d) <= %d ))) ", - itemName, itemNameDash, itemNameTrimmed, sSize, sDiff); - clickMsg = openMsgM; - } - else if (sameString("numtSAssembled", table)) + if (sameString("numtS", table) || sameString("numtSAssembled", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtSMitochondrionChrPlacement where ( " "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND " " (ABS((chromEnd - chromStart)-%d) <= %d ))) ", itemName, itemNameDash, itemNameTrimmed, sSize, sDiff); clickMsg = openMsgM; } else if (sameString("numtSMitochondrion", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtS where ( " "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND "