e8e125d39087195e7dad2f615255294838b7cdbd
tdreszer
Fri Oct 21 12:42:28 2011 -0700
Objectified the js for findTracks. Also fixed redmine 5692
diff --git src/hg/hgFileSearch/hgFileSearch.c src/hg/hgFileSearch/hgFileSearch.c
index 69c2df0..2f541e4 100644
--- src/hg/hgFileSearch/hgFileSearch.c
+++ src/hg/hgFileSearch/hgFileSearch.c
@@ -211,62 +211,62 @@
printf("\n",TRACK_SEARCH_DEL_ROW);
printf("\n",TRACK_SEARCH_ADD_ROW);
#ifdef USE_TABS
printf("\n", FILE_SEARCH_CURRENT_TAB, currentTab);
printf("
\n"
"
\n",cgiBrowser()==btIE?"width:1060px;":"max-width:inherit;");
// Files tab
printf("
\n");
#endif///def USE_TABS
// Files tab
printf("
\n"
"
\n");
cols = 8;
// Track Name contains
printf(" | ");
printf("Track Name: | ");
printf("contains | \n");
printf("", cols - 4);
-printf("",
+printf("",
TRACK_SEARCH_ON_NAME, nameSearch == NULL ? "" : nameSearch);
printf(" |
\n");
// Description contains
printf(" | and | ");
printf("Description: | ");
printf("contains | \n");
printf("", cols - 4);
-printf("",
+printf("",
TRACK_SEARCH_ON_DESCR, descSearch == NULL ? "" : descSearch);
printf(" |
\n");
if (selectedTab==filesTab && descSearch)
searchTermsExist = TRUE;
// Set up Group dropdown
struct grp *grps = hLoadGrps(db);
grps = groupsFilterForTdbList(&grps,tdbList);
int numGroups = slCount(grps) + 1; // Add Any
char **groups = needMem(sizeof(char *) * numGroups);
char **labels = needMem(sizeof(char *) * numGroups);
groups[0] = ANYLABEL;
labels[0] = ANYLABEL;
int ix=1;
struct grp *grp = grps;
@@ -306,31 +306,31 @@
if(metaDbExists)
{
struct slPair *mdbVars = mdbVarsSearchable(conn,FALSE,TRUE); // Not tables, just files
mdbSelects = mdbSelectPairs(cart, mdbVars);
char *output = mdbSelectsHtmlRows(conn,mdbSelects,mdbVars,cols,TRUE); // restricted to file search
if (output)
{
puts(output);
freeMem(output);
}
slPairFreeList(&mdbVars);
}
printf("
\n");
printf("
\n", FILE_SEARCH);
-printf("
\n");
+printf("
\n");
printf("
\n");
//printf("
help\n");
printf("
\n");
#ifdef USE_TABS
printf("
\n"); // End tabs div
#endif///def USE_TABS
if(nameSearch != NULL && !strlen(nameSearch))
nameSearch = NULL;
if(descSearch != NULL && !strlen(descSearch))
descSearch = NULL;
if(groupSearch != NULL && sameString(groupSearch, ANYLABEL))
groupSearch = NULL;