64beba721f5618a04b2f3675ae9a3382caaf7b83
Merge parents 01a5191 256953f
max
  Tue Jul 9 11:25:20 2013 -0700
fixing merge conflict
diff --cc src/hg/hgc/hgc.c
index 77dae99,a6a247c..8e2a3ab
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@@ -919,34 -919,34 +919,34 @@@
      for (html = htmls; html != NULL; html = html->next)
          printf("<br>\n%s\n", html->html);
      itemDetailsHtmlFreeList(&htmls);
      hFreeConn(&conn);
      }
  }
  
  char *getIdInUrl(struct trackDb *tdb, char *itemName)
  /* If we have an idInUrlSql tag, look up itemName in that, else just
   * return itemName. */
  {
  char *sql = trackDbSetting(tdb, "idInUrlSql");
  char *id = itemName;
  if (sql != NULL)
      {
 -    char query[256];
 -    sqlSafef(query, sizeof(query), sql, itemName);
 +    char buf[256];
 +    sqlSafef(buf, sizeof(buf), sql, itemName);
      struct sqlConnection *conn = hAllocConn(database);
-     id = sqlQuickString(conn, buf);
+     id = sqlQuickString(conn, query);
      hFreeConn(&conn);
      }
  return id;
  }
  
  char* replaceInUrl(struct trackDb *tdb, char *url, char *idInUrl, boolean encode) 
  /* replace $$ in url with idInUrl. Supports many other wildchards */
  {
  struct dyString *uUrl = NULL;
  struct dyString *eUrl = NULL;
  char startString[64], endString[64];
  char *ins[9], *outs[9];
  char *eItem = (encode ? cgiEncode(idInUrl) : cloneString(idInUrl));
  
  safef(startString, sizeof startString, "%d", winStart);