src/hg/inc/metaTbl.h 1.6

Index: src/hg/inc/metaTbl.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/inc/metaTbl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 4 -r1.5 -r1.6
--- src/hg/inc/metaTbl.h	25 Mar 2010 21:55:32 -0000	1.5
+++ src/hg/inc/metaTbl.h	30 Mar 2010 23:35:24 -0000	1.6
@@ -194,11 +194,17 @@
 
 struct metaObj *metaObjsLoadFromFormattedFile(char *fileName);
 // Load all metaObjs from a file containing metadata formatted lines
 
+struct metaObj *metaObjsLoadFromHashes(struct hash *objsHash);
+// Load all metaObjs from a file containing metadata formatted lines
+
+struct metaObj *metaObjsLoadFromRAFile(char *fileName);
+// Load all metaObjs from a file containing RA formatted 'metaObjects'
+
 
 // -------------- Updating the DB --------------
-int metaObjsSetToDb(struct sqlConnection *conn,char *tableName,struct metaObj *metaObjs,boolean replace);
+int metaObjsSetToDb(struct sqlConnection *conn,char *tableName,struct metaObj *metaObjs,boolean replace,boolean testOnly);
 // Adds or updates metadata obj/var pairs into the named table.  Returns total rows affected
 
 
 // ------------------ Querys -------------------
@@ -223,13 +229,13 @@
 // Returns new metaObj struct fully populated and sorted in obj,var order.
 
 
 // ----------- Printing and Counting -----------
-void metaObjPrint(struct metaObj *metaObjs,boolean printLong);
-// prints objs and var=val pairs as formatted metadata lines or long view
+void metaObjPrint(struct metaObj *metaObjs,boolean raStyle);
+// prints objs and var=val pairs as formatted metadata lines or ra style
 
-void metaByVarPrint(struct metaByVar *metaByVars,boolean printLong);
-// prints var=val pairs and objs that go with them single lines or long view
+void metaByVarPrint(struct metaByVar *metaByVars,boolean raStyle);
+// prints var=val pairs and objs that go with them single lines or ra style
 
 int metaObjCount(struct metaObj *metaObjs, boolean objs);
 // returns the count of vars belonging to this obj or objs;
 
@@ -249,8 +255,11 @@
 
 void metaObjRemoveVars(struct metaObj *metaObjs, char *vars);
 // Prunes list of vars for an object, freeing the memory.  Doesn't touch DB.
 
+void metaObjTransformToUpdate(struct metaObj *metaObjs, char *var, char *varType,char *val,boolean deleteThis);
+/* Turns one or more metaObjs into the stucture needed to add/update or delete. */
+
 
 // --------------- Free at last ----------------
 void metaObjsFree(struct metaObj **metaObjsPtr);
 // Frees one or more metadata objects and any contained metaVars.  Will free any hashes as well.