3c68ae03c7ec7a7e6b98c22e81f7a6489b50e515 braney Mon Feb 17 10:41:18 2020 -0800 delete long unused code for HIV, Cancer browser. RIP Fan. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 540dcab..8805aab 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -7134,54 +7134,47 @@ slReverse(&wmSpeciesList); *list = wmSpeciesList; return groups; } struct wigMafSpecies * wigMafSpeciesTable(struct cart *cart, struct trackDb *tdb, char *name, char *db) { int groupCt; #define MAX_SP_SIZE 2000 char option[MAX_SP_SIZE]; int group, prevGroup; int i,j; -boolean parentLevel = isNameAtParentLevel(tdb,name); bool lowerFirstChar = TRUE; struct wigMafSpecies *wmSpeciesList; char **groups = wigMafGetSpecies(cart, tdb, name, db, &wmSpeciesList, &groupCt); struct wigMafSpecies *wmSpecies = wmSpeciesList; struct slName *speciesList = NULL; for(; wmSpecies; wmSpecies = wmSpecies->next) { struct slName *newName = slNameNew(wmSpecies->name); slAddHead(&speciesList, newName); - //printf("%s<BR>\n",speciesList->name); } slReverse(&speciesList); int numberPerRow; boolean lineBreakJustPrinted; -char trackName[255]; -char query[256]; -char **row; -struct sqlConnection *conn; -struct sqlResult *sr; char *words[MAX_SP_SIZE]; int defaultOffSpeciesCnt = 0; if (cartOptionalString(cart, "ajax") == NULL) jsIncludeFile("utils.js",NULL); //jsInit(); puts("\n<P><B>Species selection:</B> "); cgiContinueHiddenVar("g"); char id[256]; PLUS_BUTTON( "id", "plus_pw","cb_maf_","_maf_") MINUS_BUTTON("id","minus_pw","cb_maf_","_maf_") char prefix[512]; safef(prefix, sizeof prefix, "%s.", name); @@ -7215,119 +7208,69 @@ i = 0; j = 0; if (group != 0) puts("</TR></TABLE>\n"); /* replace underscores in group names */ subChar(groups[group], '_', ' '); printf("<P> <B><EM>%s</EM></B>", groups[group]); printf(" "); safef(option, sizeof(option), "plus_%s", groups[group]); PLUS_BUTTON( "id",option,"cb_maf_",groups[group]) safef(option, sizeof(option),"minus_%s", groups[group]); MINUS_BUTTON("id",option,"cb_maf_",groups[group]) puts("\n<TABLE><TR>"); } - if (hIsGsidServer()) - numberPerRow = 6; - else numberPerRow = 5; /* new logic to decide if line break should be displayed here */ if ((j != 0 && (j % numberPerRow) == 0) && (lineBreakJustPrinted == FALSE)) { puts("</TR><TR>"); lineBreakJustPrinted = TRUE; } char id[MAX_SP_SIZE]; - boolean checked = TRUE; if (defaultOffSpeciesCnt > 0) { if (stringArrayIx(wmSpecies->name,words,defaultOffSpeciesCnt) == -1) safef(id, sizeof(id), "cb_maf_%s_%s", groups[group], wmSpecies->name); else { safef(id, sizeof(id), "cb_maf_%s_%s_defOff", groups[group], wmSpecies->name); - checked = FALSE; } } else safef(id, sizeof(id), "cb_maf_%s_%s", groups[group], wmSpecies->name); - if (hIsGsidServer()) - { - char *chp; - /* for GSID maf, display only entries belong to the specific MSA selected */ - safef(option, sizeof(option), "%s.%s", name, wmSpecies->name); - label = hOrganism(wmSpecies->name); - if (label == NULL) - label = wmSpecies->name; - strcpy(trackName, tdb->track); - - /* try AaMaf first */ - chp = strstr(trackName, "AaMaf"); - /* if it is not a AaMaf track, try Maf next */ - if (chp == NULL) chp = strstr(trackName, "Maf"); - - /* test if the entry actually is part of the specific maf track data */ - if (chp != NULL) - { - *chp = '\0'; - sqlSafef(query, sizeof(query), - "select id from %sMsa where id = 'ss.%s'", trackName, label); - - conn = hAllocConn(db); - sr = sqlGetResult(conn, query); - row = sqlNextRow(sr); - - /* offer it only if the entry is found in current maf data set */ - if (row != NULL) - { - puts("<TD>"); - cgiMakeCheckBoxWithId(option,cartUsualBooleanClosestToHome( - cart, tdb, parentLevel,wmSpecies->name, checked),id); - printf("%s", label); - puts("</TD>"); - fflush(stdout); - lineBreakJustPrinted = FALSE; - j++; - } - sqlFreeResult(&sr); - hFreeConn(&conn); - } - } - else - { puts("<TD>"); boolean defaultState = TRUE; if (offHash != NULL) defaultState = (hashLookup(offHash, wmSpecies->name) == NULL); safecpy(option, sizeof(option), name); wmSpecies->on = isSpeciesOn(cart, tdb, wmSpecies->name, option, sizeof option, defaultState ); cgiMakeCheckBoxWithId(option, wmSpecies->on,id); label = hOrganism(wmSpecies->name); if (label == NULL) label = wmSpecies->name; if (lowerFirstChar) *label = tolower(*label); printf("%s<BR>", label); puts("</TD>"); lineBreakJustPrinted = FALSE; j++; } - } puts("</TR></TABLE><BR>\n"); return wmSpeciesList; } void wigMafCfgUi(struct cart *cart, struct trackDb *tdb,char *name, char *title, boolean boxed, char *db) /* UI for maf/wiggle track * NOTE: calls wigCfgUi */ { int i; char option[MAX_SP_SIZE]; boolean parentLevel = isNameAtParentLevel(tdb,name); boxed = cfgBeginBoxAndTitle(tdb, boxed, title); char *defaultCodonSpecies = trackDbSetting(tdb, SPECIES_CODON_DEFAULT);