Index: trunk/ippTools/src/camtoolConfig.c
===================================================================
--- trunk/ippTools/src/camtoolConfig.c	(revision 12237)
+++ trunk/ippTools/src/camtoolConfig.c	(revision 13578)
@@ -154,5 +154,5 @@
             "define banana 1", NULL);
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
-            "set fault code (required)", 0);
+            "set fault code", 0);
     psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-faulted",  0,
             "only return imfiles with a fault status set", false);
@@ -199,61 +199,21 @@
             "name of a label to unmask", NULL);
 
-#define PXTOOL_MODE(option, modeval, argset) \
-{ \
-    int N = 0; \
-    if ((N = psArgumentGet (argc, argv, option))) { \
-        psArgumentRemove (N, &argc, argv); \
-        if (config->mode) { \
-            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \
-            psFree(config); \
-            return NULL; \
-        } \
-        config->mode = modeval; \
-        config->args = psMemIncrRefCounter(argset); \
-    } \
-    if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
-        psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option);\
-    } \
-    psFree(argset); \
-}
-
     psMetadata *argSets = psMetadataAlloc();
-    // find which mode we're running under
-    PXTOOL_MODE("-queue",           CAMTOOL_MODE_QUEUE,         queueArgs);
-    PXTOOL_MODE("-pendingexp",      CAMTOOL_MODE_PENDINGEXP,    pendingexpArgs);
-    PXTOOL_MODE("-pendingimfile",CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
-    PXTOOL_MODE("-addprocessedexp", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
-    PXTOOL_MODE("-processedexp", CAMTOOL_MODE_PROCESSEDEXP,  processedexpArgs);
-    PXTOOL_MODE("-updateprocessedexp", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
-    PXTOOL_MODE("-block",           CAMTOOL_MODE_BLOCK,         blockArgs);
-    PXTOOL_MODE("-masked",          CAMTOOL_MODE_MASKED,        maskedArgs);
-    PXTOOL_MODE("-unblock",         CAMTOOL_MODE_UNBLOCK,       unblockArgs);
-
-    bool argErr = false;
-    if (config->mode == CAMTOOL_MODE_NONE) {
-        argErr = true;
-        fprintf (stderr, "mode argument is required\n");
-    } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) {
-        argErr = true;
-        fprintf (stderr, "error parsing arguments\n");
-    }
-
-    if (argErr) {
-        printf("\nPan-STARRS Camera Tool\n");
-        printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> :\n\n");
-
-        psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL);
-        psMetadataItem *item = NULL;
-        while ((item = psMetadataGetAndIncrement(iter))) {
-            if (!item->type == PS_DATA_METADATA) {
-                psAbort("all options must be specified as a metadata");            }
-
-            fprintf(stdout, "%s ", item->name);
-            psArgumentHelp(item->data.md);
-        }
-        psFree(iter);
-
+    psMetadata *modes = psMetadataAlloc(); 
+
+    PXTOOL_ADD_MODE("-queue",               "", CAMTOOL_MODE_QUEUE,         queueArgs);
+    PXTOOL_ADD_MODE("-pendingexp",          "", CAMTOOL_MODE_PENDINGEXP,    pendingexpArgs);
+    PXTOOL_ADD_MODE("-pendingimfile",       "", CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
+    PXTOOL_ADD_MODE("-addprocessedexp",     "", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
+    PXTOOL_ADD_MODE("-processedexp",        "", CAMTOOL_MODE_PROCESSEDEXP,  processedexpArgs);
+    PXTOOL_ADD_MODE("-updateprocessedexp",  "", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
+    PXTOOL_ADD_MODE("-block",               "", CAMTOOL_MODE_BLOCK,         blockArgs);
+    PXTOOL_ADD_MODE("-masked",              "", CAMTOOL_MODE_MASKED,        maskedArgs);
+    PXTOOL_ADD_MODE("-unblock",             "", CAMTOOL_MODE_UNBLOCK,       unblockArgs);
+
+    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
+        psError(PS_ERR_UNKNOWN, true, "option parsing failed");
         psFree(argSets);
+        psFree(modes);
         psFree(config);
         return NULL;
@@ -261,4 +221,5 @@
 
     psFree(argSets);
+    psFree(modes);
 
     // setup search criterion
@@ -346,8 +307,4 @@
     }
 
-    // save argv/argc
-    config->argv = argv;
-    config->argc = argc;
-
     return config;
 }