235301fd42a93e1ba15678074735ca2ce7ffe3d6
Merge parents caa4f9e ffae904
tdreszer
  Fri Dec 2 11:08:58 2011 -0800
Merge branch 'master' into tdreszer-subCfg
diff --cc src/hg/hgFileSearch/hgFileSearch.c
index ab3e79c,0b33da2..51fe504
--- src/hg/hgFileSearch/hgFileSearch.c
+++ src/hg/hgFileSearch/hgFileSearch.c
@@@ -425,41 -425,47 +425,41 @@@
  
  cartWebStart(cart, db, "Search for " FILE_SEARCH_WHAT " in the %s %s Assembly", organism, hFreezeFromDb(db));
  
  // This cleverness allows us to have the background image like "Track Search" does, without all the hgTracks overhead
  printf("<style type='text/css'>body {background-image:url('%s');}</style>",hBackgroundImage());
  
  webIncludeResourceFile("HGStyle.css");
  webIncludeResourceFile("jquery-ui.css");
  webIncludeResourceFile("ui.dropdownchecklist.css");
  jsIncludeFile("jquery.js", NULL);
  jsIncludeFile("jquery-ui.js", NULL);
  jsIncludeFile("ui.dropdownchecklist.js",NULL);
  jsIncludeFile("utils.js",NULL);
  
  // This line is needed to get the multi-selects initialized
 -#ifdef NEW_JQUERY
  jsIncludeFile("ddcl.js",NULL);
 -printf("<script type='text/javascript'>var newJQuery=true;</script>\n");
  printf("<script type='text/javascript'>$(document).ready(function() { findTracks.updateMdbHelp(0); });</script>\n");
 -#else///ifndef NEW_JQUERY
 -printf("<script type='text/javascript'>var newJQuery=false;</script>\n");
 -printf("<script type='text/javascript'>$(document).ready(function() { findTracks.updateMdbHelp(0);  $('.filterBy').each( function(i) { $(this).dropdownchecklist({ firstItemChecksAll: true, noneIsAll: true, maxDropHeight: filterByMaxHeight(this) });});});</script>\n");
 -#endif///ndef NEW_JQUERY
  
  doFileSearch(db,organism,cart,tdbList);
  
  
  printf("<BR>\n");
  webEnd();
  }
  
- char *excludeVars[] = { "submit", "Submit", "g", "ajax", FILE_SEARCH,TRACK_SEARCH_ADD_ROW,TRACK_SEARCH_DEL_ROW};  // HOW IS 'ajax" going to be supported?
+ char *excludeVars[] = { "submit", "Submit", "g", "ajax", "clearCache", FILE_SEARCH,TRACK_SEARCH_ADD_ROW,TRACK_SEARCH_DEL_ROW};  // HOW IS 'ajax" going to be supported?
  
  int main(int argc, char *argv[])
  /* Process command line. */
  {
  cgiSpoof(&argc, argv);
  htmlSetBackground(hBackgroundImage());
  cartEmptyShell(doMiddle, hUserCookie(), excludeVars, NULL);
  return 0;
  }
  
  // TODO:
  // 1) Done: Limit to first 1000
  // 2) Work out simple verses advanced tabs
  // 3) work out support for non-encode downloads
  // 4) Make an hgTrackSearch to replace hgTracks track search ??   Simlpler code, but may not be good idea because of composite reshaping in cart vars