src/hg/instinct/bioInt2/bioController.h 1.3

Index: src/hg/instinct/bioInt2/bioController.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/bioInt2/bioController.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -B -U 4 -r1.2 -r1.3
--- src/hg/instinct/bioInt2/bioController.h	21 Mar 2009 21:31:54 -0000	1.2
+++ src/hg/instinct/bioInt2/bioController.h	22 Mar 2009 01:07:28 -0000	1.3
@@ -8,30 +8,43 @@
 #include "common.h"
 #include "bioIntDb.h"
 
 
+struct analysisResult {
+    struct analysisResult *next;
+    char *sample;
+    char *feature;
+
+    double val;
+    double conf;
+};
+
 struct biAnalysis {
     struct biAnalysis *next;
     char *db;
     char *tableName;
+    struct slName *inputTables;
     struct hash *parameters;
 
     struct analysisResult *(*analyze)(struct biAnalysis *ba, struct slPair *spList, 
 				     char *sample, char *gene);
 }; 
 
-struct analysisResult {
-    struct analysisResult *next;
-    char *sample;
-    char *feature;
 
-    double val;
-    double conf;
-};
+int findIdInTable(struct sqlConnection *biConn, char *tableName,
+		  char *idField, char *sField, char *name); 
+
+void runAnalysisPipeline(struct biAnalysis *baList);
+
+/* Gene Level Analyses */
+struct analysisResult *metaGene(struct biAnalysis *ba, struct slPair *spList,
+				char *sample, char *gene); 
+
+
+/* Geneset Analyses */
 
 
-struct biAnalysis *registerGeneLevelAnalyses(char *db, struct slName *datasets);
+/* Pathway Analyses */
 
-void runAnalysisPipeline(char *db, char *datasets, struct biAnalysis *baList);
 
 
 #endif /* BIOCONTROLLER_H */