src/hg/instinct/bioInt2/bioIntDriver.h 1.7

Index: src/hg/instinct/bioInt2/bioIntDriver.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/bioInt2/bioIntDriver.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -B -U 4 -r1.6 -r1.7
--- src/hg/instinct/bioInt2/bioIntDriver.h	30 Apr 2009 19:54:28 -0000	1.6
+++ src/hg/instinct/bioInt2/bioIntDriver.h	20 May 2009 20:34:36 -0000	1.7
@@ -30,8 +30,20 @@
 #define GI_TABLE "genesetInfo"
 #define SA_TABLE "samples"
 #define TI_TABLE "tissues"
 
+#define EP_TABLE "entityPathways_ncipid"
+#define EN_TABLE "entities_ncipid"
+#define ELT_TABLE "entityLinkTypes_ncipid"
+#define EL_TABLE "entityLinks_ncipid"
+
+struct typeHash {
+    struct typeHash *next;
+    char *type;
+    struct hash *hash;
+}; 
+
+
 struct biQuery {
     struct biQuery *next;
 
     char *db;
@@ -162,8 +174,22 @@
 void slPairAnalysisValsFreeList(struct slPair **pList);
 
 struct analysisVals *cloneAnalysisVals(struct analysisVals *av);
 
+void slPairHashesFree(struct slPair **pEl);
+
+void slPairHashesFreeList(struct slPair **pList);
+
+void slPairStringFree(struct slPair **pEl);
+
+void slPairStringFreeList(struct slPair **pList);
+
+void analysisValsSamplesHashes(struct sqlConnection *biConn, struct hash *hash,
+			       struct slPair **spList, char *dataset, char *type);
+
+struct slPair *analysisValsSamplesHashesList(struct sqlConnection *biConn,
+					     struct slName *datasets);
+
 void storeAnalysisValsInDb(struct sqlConnection *biConn, char *tableName,
 			   struct analysisVals *avList);
 
 struct hash *createIdHash(struct sqlConnection *biConn, char *tableName, char *fieldName);