src/hg/makeDb/metaTblUpdate/metaTblUpdate.c 1.2

Index: src/hg/makeDb/metaTblUpdate/metaTblUpdate.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/metaTblUpdate/metaTblUpdate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/makeDb/metaTblUpdate/metaTblUpdate.c	18 Mar 2010 01:56:26 -0000	1.1
+++ src/hg/makeDb/metaTblUpdate/metaTblUpdate.c	18 Mar 2010 23:37:24 -0000	1.2
@@ -1,5 +1,5 @@
-/* metaTblUpdate - Adds, updates or removes metadata obkjects and variables from the metaTbl. */
+/* metaTblUpdate - Adds, updates or removes metadata objects and variables from the metaTbl. */
 #include "common.h"
 #include "linefile.h"
 #include "hash.h"
 #include "options.h"
@@ -15,8 +15,11 @@
 #include "metaTbl.h"
 
 static char const rcsid[] = "$Id$";
 
+#define DB_DEFAULT      "hg19"
+#define OBJTYPE_DEFAULT "table"
+
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
@@ -37,19 +40,19 @@
   "usage:\n"
   "   metaTblUpdate [-db=] [-table=] [-obj= [-type=] [-delete] [-var=] [-binary] [-val=]]\n"
   "                       [-replace] [fileName]\n\n"
   "Options:\n"
-  "    -db database to load metadata to.  Default is 'hg19'.\n"
-  "    -table table to load metadata to.  Default is 'metaTbl'.\n"
+  "    -db      Database to load metadata to.  Default is '" DB_DEFAULT "'.\n"
+  "    -table   Table to load metadata to.  Default is '" METATBL_DEFAULT_NAME "'.\n"
   "  if file not provided, then -obj must be provided\n"
-  "    -obj={objName}     means Load from command line:\n"
-  "       -type={objType} needed if adding new obj, otherwise ignored\n"
-  "       -delete         a specific var or entire obj (if -var not provided) otherwise add or update\n"
-  "       -var={varName}  provide variable name (if no -var then must be -remove to remove obj)\n"
+  "    -obj={objName}     Means Load from command line:\n"
+  "       -type={objType} Used if adding new obj, otherwise ignored.  Default is '" OBJTYPE_DEFAULT "'.\n"
+  "       -delete         Remove a specific var or entire obj (if -var not provided) otherwise add or update\n"
+  "       -var={varName}  Provide variable name (if no -var then must be -remove to remove obj)\n"
   "       -binary         NOT YET IMPLEMENTED.  This var has a binary val and -val={file}\n"
-  "       -val={value}    (enclosed in quotes if necessary. If -var and no -val then must be -remove\n"
+  "       -val={value}    (Enclosed in \"quotes if necessary\".) If -var and no -val then must be -remove\n"
   "    [file] File containing formatted metadata lines.  Ignored if -obj param provided:\n"
-  "      -replace means remove all old variables for an object before adding new variables\n"
+  "      -replace   Means remove all old variables for an object before adding new variables\n"
   );
 }
 
 static struct optionSpec optionSpecs[] = {
@@ -64,49 +67,37 @@
     {"replace", OPTION_BOOLEAN},// replace entire obj when loading from file
     {NULL,      0}
 };
 
-#define DB_DEFAULT      "hg19"
-#define TBL_DEFAULT     "metaTbl"
-#define OBJTYPE_DEFAULT "table"
 
 int main(int argc, char *argv[])
 // Process command line.
 {
 struct metaObj * metaObjs = NULL;
 
 optionInit(&argc, argv, optionSpecs);
 char *db    = optionVal("db",   DB_DEFAULT);
-char *table = optionVal("table",TBL_DEFAULT);
+char *table = optionVal("table",METATBL_DEFAULT_NAME);
 boolean replace = FALSE;
 
 if(optionExists("obj"))
     {
     if(argc > 1)
         usage(); // Must not have submitted formatted file also
 
-    AllocVar(metaObjs);
-
-    metaObjs->objName = cloneString(optionVal("obj",  NULL));
-    metaObjs->objType = metaObjTypeStringToEnum(optionVal("type", OBJTYPE_DEFAULT));
-
-    metaObjs->deleteThis = optionExists("delete");
+    if(optionExists("delete") && optionExists("var") && optionExists("val"))
+        usage();
 
-    if(optionExists("var"))
-        {
-        struct metaVar * metaVar;
-        AllocVar(metaVar);
+    if (!optionExists("delete") && (!optionExists("var") || !optionExists("val")))
+        usage();
 
-        metaVar->var     = cloneString(optionVal("var", NULL));
-        metaVar->varType = (optionExists("binary") ? vtBinary : vtTxt);
-        metaVar->val     = cloneString(optionVal("val", NULL));
-        metaObjs->vars = metaVar; // Only one
+    metaObjs = metaObjCreate(optionVal("obj",  NULL),
+                             optionVal("type", OBJTYPE_DEFAULT),
+                             optionVal("var", NULL),
+                            (optionExists("binary") ? "binary" : "txt"), // FIXME: don't know how to deal with binary yet
+                             optionVal("val", NULL));
 
-        if (!metaObjs->deleteThis && metaVar->val == NULL)
-            usage();
-        }
-    else if (!metaObjs->deleteThis)
-            usage();
+    metaObjs->deleteThis = optionExists("delete");
 
     verbose(2, "metadata %s %s %s%s%s%s\n",
         metaObjs->objName,metaObjTypeEnumToString(metaObjs->objType),
         (metaObjs->deleteThis ? "delete ":""),