a4fdc4a93499c868a15a5d732a3e76db887d33c7
kate
  Fri May 17 15:43:48 2013 -0700
Cleanup libification of factorSource UI. refs #10097
diff --git src/hg/inc/hui.h src/hg/inc/hui.h
index daf09e9..5367182 100644
--- src/hg/inc/hui.h
+++ src/hg/inc/hui.h
@@ -1222,35 +1222,42 @@
 boolean makeDownloadsLink(char *database, struct trackDb *tdb);
 // Make a downloads link (if appropriate and then returns TRUE)
 
 boolean makeSchemaLink(char *db,struct trackDb *tdb,char *label);
 // Make a table schema link (if appropriate and then returns TRUE)
 
 void makeTopLink(struct trackDb *tdb);
 // Link to top of UI page
 
 void extraUiLinks(char *db,struct trackDb *tdb);
 // Show downloads, schema and metadata links where appropriate
 
 boolean chainDbNormScoreAvailable(struct trackDb *tdb);
 /*	check if normScore column is specified in trackDb as available */
 
+/* UI for factorSource track type */
+
+/* trackDb settings: */
+#define SOURCE_TABLE "sourceTable"
+#define SOURCE_TABLE_PACK "sourceTablePack"
+
 void hPrintAbbreviationTable(struct sqlConnection *conn, char *sourceTable, char *label);
 /* Print out table of abbreviations. */
 
-void hPrintFactorSourceAbbrevTable(struct sqlConnection *conn, char *sourceTable, boolean cellsOnly);
-/* Print out table of abbreviations. Optionally, extract cell name only (before '+') and uniqify */
+void hPrintFactorSourceAbbrevTable(struct sqlConnection *conn, struct trackDb *tdb);
+/* Print out table of abbreviations. With 'pack' setting, 
+ * show cell name only (before '+') and uniqify */
 
 // Four State checkboxes can be checked/unchecked by enable/disabled
 // NOTE: fourState is not a bitmap because it is manipulated in javascript
 //       and int seemed easier at the time
 #define FOUR_STATE_UNCHECKED         0
 #define FOUR_STATE_CHECKED           1
 #define FOUR_STATE_CHECKED_DISABLED  -1
 #define fourStateChecked(fourState) \
         ((fourState) == FOUR_STATE_CHECKED || (fourState) == FOUR_STATE_CHECKED_DISABLED)
 #define fourStateEnabled(fourState) ((fourState) >= FOUR_STATE_UNCHECKED)
 #define fourStateVisible(fourState) ((fourState) == FOUR_STATE_CHECKED)
 
 int subtrackFourStateChecked(struct trackDb *subtrack, struct cart *cart);
 // Returns the four state checked state of the subtrack