src/hg/inc/metaTbl.h 1.8

Index: src/hg/inc/metaTbl.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/inc/metaTbl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -B -U 4 -r1.7 -r1.8
--- src/hg/inc/metaTbl.h	31 Mar 2010 23:34:43 -0000	1.7
+++ src/hg/inc/metaTbl.h	1 Apr 2010 23:52:17 -0000	1.8
@@ -187,9 +187,9 @@
 struct metaByVar *metaByVarsLineParse(char *line);
 /* Parses a line of "var1=val1 var2=val2 into a metaByVar object for queries. */
 
 
-// ------ Loading from args, hashes and tdb ------
+// ------ Loading from args, hashes ------
 struct metaObj *metaObjCreate(char *obj,char *type,char *var, char *varType,char *val);
 /* Creates a singular metaObj query object based on obj and all other optional params. */
 
 struct metaByVar*metaByVarCreate(char *var, char *varType,char *val);
@@ -197,11 +197,8 @@
 
 struct metaObj *metaObjsLoadFromHashes(struct hash *objsHash);
 // Load all metaObjs from a file containing metadata formatted lines
 
-struct metaObj *metadataForTable(char *db,struct trackDb *tdb,char *table);
-// Returns the metadata for a table.  Either tdb or table must be provided
-
 
 // ------ Loading from files ------
 struct metaObj *metaObjsLoadFromFormattedFile(char *fileName,boolean *validated);
 // Load all metaObjs from a file containing metadata formatted lines
@@ -262,9 +259,9 @@
 // returns the count of objs belonging to this set of vars;
 
 
 // ----------------- Utilities -----------------
-char *metadataFindValue(struct metaObj *metaObj, char *var);
+char *metaObjFindValue(struct metaObj *metaObj, char *var);
 // Finds the val associated with the var or retruns NULL
 
 boolean metaObjContains(struct metaObj *metaObj, char *var, char *val);
 // Returns TRUE if object contains var, val or both
@@ -280,10 +277,10 @@
 
 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. */
 
-int metaObjCRC(struct metaObj *metaObjs);
-// returns a summ of all individual CRC values of all metObj strings
+struct metaObj *metaObjClone(struct metaObj *metaObj);
+// Clones a single metaObj, including hash and maintining order
 
 
 // --------------- Free at last ----------------
 void metaObjsFree(struct metaObj **metaObjsPtr);
@@ -291,6 +288,16 @@
 
 void metaByVarsFree(struct metaByVar **metaByVarsPtr);
 // Frees one or more metadata vars and any contained vals and objs.  Will free any hashes as well.
 
+
+// ----------------- CGI specific routines for use with tdb -----------------
+struct metaObj *metadataForTable(char *db,struct trackDb *tdb,char *table);
+// Returns the metadata for a table.  NEVER FREE THIS STRUCT!
+// This is the main routine for CGIs to access metadata
+
+char *metadataFindValue(struct trackDb *tdb, char *var);
+// Finds the val associated with the var or retruns NULL
+
+
 #endif /* METATBL_H */