Index: trunk/ippTools/configure.ac
===================================================================
--- trunk/ippTools/configure.ac	(revision 34080)
+++ trunk/ippTools/configure.ac	(revision 34081)
@@ -8,5 +8,5 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -57,5 +57,5 @@
 
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror"
+IPP_STDCFLAGS
 
 IPPDB_VERSION=`$PKG_CONFIG --modversion ippdb`
Index: trunk/ippTools/src/addtool.c
===================================================================
--- trunk/ippTools/src/addtool.c	(revision 34080)
+++ trunk/ippTools/src/addtool.c	(revision 34081)
@@ -726,5 +726,5 @@
 
     // required
-    PXOPT_LOOKUP_S64(add_id, config->args, "-add_id", true, false);
+    // PXOPT_LOOKUP_S64(add_id, config->args, "-add_id", true, false);
 
     // optional
@@ -735,4 +735,5 @@
     PXOPT_LOOKUP_S16(fault,         config->args, "-fault", false, false);
     PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false);
+
     // generate restrictions
     psMetadata *where = psMetadataAlloc();
@@ -1538,5 +1539,5 @@
 
     // required
-  PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false);
   PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false);
 
@@ -1793,5 +1794,5 @@
   psMetadata *where = psMetadataAlloc();
 
-  PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", true, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", true, false);
   PXOPT_LOOKUP_S16(fault,  config->args, "-set_fault", false, false);
   PXOPT_LOOKUP_F32(dtime_relphot,  config->args, "-set_dtime_relphot", false, false);
Index: trunk/ippTools/src/bgtool.c
===================================================================
--- trunk/ippTools/src/bgtool.c	(revision 34080)
+++ trunk/ippTools/src/bgtool.c	(revision 34081)
@@ -935,5 +935,5 @@
 
     // chip_bg_id is required
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -1052,5 +1052,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -1169,5 +1169,5 @@
 
     // required
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
 
@@ -1222,5 +1222,5 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true,  false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_BOOL(clean,  config->args, "-clean", false);
@@ -2017,5 +2017,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2133,5 +2133,5 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true,  false);
+    // PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_BOOL(clean,  config->args, "-clean", false);
Index: trunk/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 34080)
+++ trunk/ippTools/src/camtool.c	(revision 34081)
@@ -1270,5 +1270,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 34080)
+++ trunk/ippTools/src/chiptool.c	(revision 34081)
@@ -254,5 +254,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
+    // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -346,5 +346,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
+    // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1017,8 +1017,8 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
 
-    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
+    // PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
     // if cam_id is not supplied chip_id is required
-    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);
-    PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);
+    // PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);
     PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", true, false);
 
@@ -1774,5 +1774,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(dummy, config->args, "-chip_id", true,  false);
+  // PXOPT_LOOKUP_S64(dummy, config->args, "-chip_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
@@ -1937,5 +1937,5 @@
 
 //    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
+    // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
Index: trunk/ippTools/src/dettool.c
===================================================================
--- trunk/ippTools/src/dettool.c	(revision 34080)
+++ trunk/ippTools/src/dettool.c	(revision 34081)
@@ -2116,5 +2116,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
+  // replaced below PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: trunk/ippTools/src/dettool_processedexp.c
===================================================================
--- trunk/ippTools/src/dettool_processedexp.c	(revision 34080)
+++ trunk/ippTools/src/dettool_processedexp.c	(revision 34081)
@@ -266,5 +266,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
@@ -283,5 +283,5 @@
 bool updatestateprocessedMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
+  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
   PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
 
Index: trunk/ippTools/src/dettool_processedimfile.c
===================================================================
--- trunk/ippTools/src/dettool_processedimfile.c	(revision 34080)
+++ trunk/ippTools/src/dettool_processedimfile.c	(revision 34081)
@@ -298,5 +298,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
Index: trunk/ippTools/src/dettool_residexp.c
===================================================================
--- trunk/ippTools/src/dettool_residexp.c	(revision 34080)
+++ trunk/ippTools/src/dettool_residexp.c	(revision 34081)
@@ -356,5 +356,5 @@
 bool updatestateresidMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
+  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
   PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
 
Index: trunk/ippTools/src/dettool_residimfile.c
===================================================================
--- trunk/ippTools/src/dettool_residimfile.c	(revision 34080)
+++ trunk/ippTools/src/dettool_residimfile.c	(revision 34081)
@@ -284,5 +284,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 34080)
+++ trunk/ippTools/src/difftool.c	(revision 34081)
@@ -1075,5 +1075,5 @@
 
     // default
-    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
 
@@ -2059,5 +2059,5 @@
     PXOPT_LOOKUP_BOOL(newTemplates,config->args,"-new-templates", false);
 
-    PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
+    // PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
 
@@ -2849,5 +2849,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-diff_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-diff_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: trunk/ippTools/src/disttool.c
===================================================================
--- trunk/ippTools/src/disttool.c	(revision 34080)
+++ trunk/ippTools/src/disttool.c	(revision 34081)
@@ -403,4 +403,8 @@
     }
 
+    if (0) {
+	fprintf (stderr, "runJoinStr: %s\n", runJoinStr);
+    }
+
     if (!strcmp(stage, "raw")) {
         if (!no_magic) {
@@ -726,4 +730,5 @@
     }
 
+    if (simple) {/* no option? */}
 
     if (pretend) {
@@ -1833,4 +1838,6 @@
         psStringAppend(&query, " %s last_fileset = '%s'", sep, last_fileset);
     }
+#else
+    if (0) { fprintf (stderr, "sep: %s\n", sep); }
 #endif
 
@@ -2186,6 +2193,6 @@
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
 
-    PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
-    PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
+    // PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
+    // PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
 
     pxAddLabelSearchArgs (config, where, "-label", "distRun.label", "==");
Index: trunk/ippTools/src/dqstatstool.c
===================================================================
--- trunk/ippTools/src/dqstatstool.c	(revision 34080)
+++ trunk/ippTools/src/dqstatstool.c	(revision 34081)
@@ -829,5 +829,5 @@
 static bool updaterunMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config,false);
-  PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
+  // PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
   PXOPT_LOOKUP_STR(state,      config->args, "-set_state",      true, false);
   PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);
Index: trunk/ippTools/src/faketool.c
===================================================================
--- trunk/ippTools/src/faketool.c	(revision 34080)
+++ trunk/ippTools/src/faketool.c	(revision 34081)
@@ -1263,5 +1263,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: trunk/ippTools/src/laptool.c
===================================================================
--- trunk/ippTools/src/laptool.c	(revision 34080)
+++ trunk/ippTools/src/laptool.c	(revision 34081)
@@ -464,5 +464,6 @@
 
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
+
+  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");
 
@@ -633,6 +634,6 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
-
+
+  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -705,7 +706,9 @@
 
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
-  PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
-  PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
+
+  // test for required opts?
+  // PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
+  // PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
+  // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
 
   PXOPT_LOOKUP_S64(set_chip_id, config->args, "-set_chip_id", false, false);
@@ -841,5 +844,6 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
+
+  // PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
   
   psMetadata *where = psMetadataAlloc();
Index: trunk/ippTools/src/magicdstool.c
===================================================================
--- trunk/ippTools/src/magicdstool.c	(revision 34080)
+++ trunk/ippTools/src/magicdstool.c	(revision 34081)
@@ -1343,5 +1343,5 @@
 {
     // required
-    PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
+    // PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
Index: trunk/ippTools/src/mergetool.c
===================================================================
--- trunk/ippTools/src/mergetool.c	(revision 34080)
+++ trunk/ippTools/src/mergetool.c	(revision 34081)
@@ -738,5 +738,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
     psMetadata *where = psMetadataAlloc();
-    PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
+    // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
     PXOPT_COPY_S64(config->args, where, "-merge_id",     "mergedvodbProcessed.merge_id", "==");
     PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
@@ -1139,10 +1139,11 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
+
+  // require? PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
+  // require? PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-mergedvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);
Index: trunk/ippTools/src/minidvodbtool.c
===================================================================
--- trunk/ippTools/src/minidvodbtool.c	(revision 34080)
+++ trunk/ippTools/src/minidvodbtool.c	(revision 34081)
@@ -411,10 +411,11 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
+
+  // PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-minidvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);
Index: trunk/ippTools/src/pstamptool.c
===================================================================
--- trunk/ippTools/src/pstamptool.c	(revision 34080)
+++ trunk/ippTools/src/pstamptool.c	(revision 34081)
@@ -48,4 +48,7 @@
 static bool stopdependentjobMode(pxConfig *config);
 static bool revertjobMode(pxConfig *config);
+
+# if (0)
+// these are unused functions -- since they are 'static', this raises an warning
 static bool addprojectMode(pxConfig *config);
 static bool projectMode(pxConfig *config);
@@ -59,4 +62,5 @@
 static bool listfileMode(pxConfig *config);
 static bool deletefileMode(pxConfig *config);
+# endif
 
 # define MODECASE(caseName, func) \
@@ -98,4 +102,5 @@
         MODECASE(PSTAMPTOOL_MODE_STOPDEPENDENTJOB, stopdependentjobMode);
         MODECASE(PSTAMPTOOL_MODE_REVERTJOB, revertjobMode);
+# if (0)
         MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode);
         MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode);
@@ -109,4 +114,5 @@
         MODECASE(PSTAMPTOOL_MODE_LISTFILE, listfileMode);
         MODECASE(PSTAMPTOOL_MODE_DELETEFILE, deletefileMode);
+# endif
         default:
             psAbort("invalid option (this should not happen)");
@@ -693,5 +699,5 @@
 static bool addjobMode(pxConfig *config)
 {
-    bool    stampJob = false;
+    bool stampJob = false;
 
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -739,4 +745,6 @@
         return false;
     }
+    if (stampJob) { /* do something?? */ }
+
     if (!pstampJobInsert(config->dbh,
             0,          // job_id
@@ -1044,4 +1052,6 @@
     // it's an allowed arg because add_poll_args adds it
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    if (limit) { /* do something?? */ }
+
     PXOPT_LOOKUP_S16(fault, config->args, "-fault",  false, false);
 
@@ -1051,17 +1061,17 @@
     psString faultClause = psStringCopy("");
     if (!fault) {
-        psStringAppend(&faultClause, " \nAND (pstampJob.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
+	psStringAppend(&faultClause, " \nAND (pstampJob.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
     }
 
     psString query = pxDataGet("pstamptool_revertjob.sql");
     if (!psListLength(where->list) && !all) {
-        psFree(where);
-        psError(PXTOOLS_ERR_CONFIG, false, "search parameters or -all are required");
-        return false;
+	psFree(where);
+	psError(PXTOOLS_ERR_CONFIG, false, "search parameters or -all are required");
+	return false;
     }
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
-        psFree(whereClause);
+	psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+	psStringAppend(&query, " AND %s", whereClause);
+	psFree(whereClause);
     }
     psFree(where);
@@ -1071,15 +1081,15 @@
     psString faultCountClause = NULL;
     if (clear_fault_count) {
-        psStringAppend(&faultCountClause, "\n, pstampJob.fault_count = 0");
+	psStringAppend(&faultCountClause, "\n, pstampJob.fault_count = 0");
     } else {
-        psStringAppend(&query, " AND pstampJob.fault_count < %d", PSTAMP_MAX_JOB_FAULTS);
+	psStringAppend(&query, " AND pstampJob.fault_count < %d", PSTAMP_MAX_JOB_FAULTS);
     }
 
     if (!p_psDBRunQueryF(config->dbh, query, faultCountClause, faultClause)) {
-        psFree(faultCountClause);
-        psFree(faultClause);
-        psFree(query);
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
+	psFree(faultCountClause);
+	psFree(faultClause);
+	psFree(query);
+	psError(PS_ERR_UNKNOWN, false, "database error");
+	return false;
     }
 
@@ -1090,4 +1100,7 @@
     return true;
 }
+
+# if (0)
+// these are unused functions
 static bool addprojectMode(pxConfig *config)
 {
@@ -1103,13 +1116,13 @@
 
     if (!pstampProjectInsert(config->dbh,
-            0,
-            name,
-            state,
-            imagedb,
-            dvodb,
-            camera,
-            telescope,
-            need_magic
-        )) {
+			     0,
+			     name,
+			     state,
+			     imagedb,
+			     dvodb,
+			     camera,
+			     telescope,
+			     need_magic
+	    )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -1448,4 +1461,5 @@
     // it's an allowed arg because add_poll_args adds it
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    if (limit) { /* do something?? */ }
 
     if (!psListLength(where->list)) {
@@ -1628,2 +1642,3 @@
     return true;
 }
+# endif
Index: trunk/ippTools/src/pxerrors.c
===================================================================
--- trunk/ippTools/src/pxerrors.c	(revision 34080)
+++ trunk/ippTools/src/pxerrors.c	(revision 34081)
@@ -26,5 +26,8 @@
 psExit pxerrorGetExitStatus(void) {
 
-    psErrorCode err = psErrorCodeLast ();
+    // psErrorCodeLast returns a psErrorCode, but we are being a bit sleezy and defining a set
+    // of enum values that have non-overlapping-ranges (not enforced by the compiler)
+
+    int err = psErrorCodeLast ();
     switch (err) {
       case PXTOOLS_ERR_SYS:
Index: trunk/ippTools/src/pztool.c
===================================================================
--- trunk/ippTools/src/pztool.c	(revision 34080)
+++ trunk/ippTools/src/pztool.c	(revision 34081)
@@ -338,8 +338,10 @@
         }
 
-/*         psStringAppend(&query, " ORDER BY dateobs"); */
-/*         if (desc) { */
-/*             psStringAppend(&query, " DESC"); */
-/*         } */
+	if (0) {
+	    psStringAppend(&query, " ORDER BY dateobs"); 
+	    if (desc) { 
+		psStringAppend(&query, " DESC"); 
+	    } 
+	}
 
         // request the full "limit" from each known camera and throw away any
Index: trunk/ippTools/src/regtool.c
===================================================================
--- trunk/ippTools/src/regtool.c	(revision 34080)
+++ trunk/ippTools/src/regtool.c	(revision 34081)
@@ -613,5 +613,5 @@
     PXOPT_LOOKUP_F32(teltemp_extra, config->args, "-teltemp_extra", false, false);
     PXOPT_LOOKUP_F32(pon_time, config->args, "-pon_time", false, false);
-    PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
+    // PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
     PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false);
     PXOPT_LOOKUP_F64(user_2, config->args, "-user_2", false, false);
@@ -1664,5 +1664,5 @@
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
 
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  // XXX unused PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
   psString query = pxDataGet("regtool_finishcompressexp.sql");
@@ -1792,5 +1792,5 @@
   psStringPrepend(&whereClause,"\n AND ");
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
   psString limitString = NULL;
@@ -2033,5 +2033,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
+  // unused and wrong! PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: trunk/ippTools/src/stacktool.c
===================================================================
--- trunk/ippTools/src/stacktool.c	(revision 34080)
+++ trunk/ippTools/src/stacktool.c	(revision 34081)
@@ -810,5 +810,5 @@
 
     // XXX require at least a stack id (add better search options)
-    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
+    // PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1697,5 +1697,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
Index: trunk/ippTools/src/staticskytool.c
===================================================================
--- trunk/ippTools/src/staticskytool.c	(revision 34080)
+++ trunk/ippTools/src/staticskytool.c	(revision 34081)
@@ -424,5 +424,5 @@
 
     // XXX require at least a sky id (add better search options)
-    PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
+    // PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -797,5 +797,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
+  // XXX unused PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
Index: trunk/ippTools/src/vptool.c
===================================================================
--- trunk/ippTools/src/vptool.c	(revision 34080)
+++ trunk/ippTools/src/vptool.c	(revision 34081)
@@ -129,9 +129,9 @@
         GET_VALUE (psString, Str, raw_workdir,   "workdir");
         GET_VALUE (psString, Str, raw_label,     "label");
-        GET_VALUE (psString, Str, raw_reduction, "reduction");
+        // GET_VALUE (psString, Str, raw_reduction, "reduction");
         // GET_VALUE (psString, Str, raw_expgroup,  "expgroup");
-        GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
-        GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
-        GET_VALUE (psString, Str, raw_end_stage, "end_stage");
+        // GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
+        // GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
+        // GET_VALUE (psString, Str, raw_end_stage, "end_stage");
 
         if (!row->exp_id) {
@@ -176,6 +176,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
-
+    // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
 
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", true, false);
@@ -672,5 +671,5 @@
     PXOPT_COPY_S16(config->args, where, "-fault", "vpProcessedCell.fault", "==");
 
-    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+    // PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
     if (!psListLength(where->list)) {
Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 34080)
+++ trunk/ippTools/src/warptool.c	(revision 34081)
@@ -1185,5 +1185,5 @@
     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
-    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    // PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 
     psString query = pxDataGet("warptool_finished_run_select.sql");
@@ -1831,5 +1831,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
+    // PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2169,5 +2169,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
+    // PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
@@ -2358,6 +2358,6 @@
     pxAddLabelSearchArgs (config, where, "-label",     "warpRun.label", "LIKE");
 
-//    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
+    // PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
+    // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);