05ccc5f7743fcccebdfd8b59c11374c23ad61bc7
Merge parents a7843fa b505056
larrym
  Mon Jun 25 11:28:23 2012 -0700
resolve merge conflict with master
diff --cc src/hg/hgFileSearch/hgFileSearch.c
index 8a2297d,2c6f33d..fee9b7f
--- src/hg/hgFileSearch/hgFileSearch.c
+++ src/hg/hgFileSearch/hgFileSearch.c
@@@ -411,51 -430,60 +430,55 @@@
  }
  
  void doMiddle(struct cart *cart)
  /* Write body of web page. */
  {
  struct trackDb *tdbList = NULL;
  char *organism = NULL;
  char *db = NULL;
  getDbAndGenome(cart, &db, &organism, NULL);
  char *chrom = cartUsualString(cart, "c", hDefaultChrom(db));
  measureTiming = isNotEmpty(cartOptionalString(cart, "measureTiming"));
  
  // QUESTION: Do We need track list ???  trackHash ??? Can't we just get one track and no children
  trackHash = trackHashMakeWithComposites(db,chrom,&tdbList,FALSE);
  
- cartWebStart(cart, db, "Search for " FILE_SEARCH_WHAT " in the %s %s Assembly", organism, hFreezeFromDb(db));
+ 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
  jsIncludeFile("ddcl.js",NULL);
- printf("<script type='text/javascript'>$(document).ready(function() { findTracks.updateMdbHelp(0); });</script>\n");
+ printf("<script type='text/javascript'>$(document).ready(function() "
+         "{ findTracks.updateMdbHelp(0); });</script>\n");
  
  doFileSearch(db,organism,cart,tdbList);
  
  
  printf("<BR>\n");
  webEnd();
  }
  
- char *excludeVars[] = { "submit", "Submit", "g", "ajax", "clearCache", 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};
  
  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
+ // 4) Make an hgTrackSearch to replace hgTracks track search ??   
+ //    Simlpler code, but may not be good idea because of composite reshaping in cart vars