Index: trunk/ippTools/src/warptoolConfig.c
===================================================================
--- trunk/ippTools/src/warptoolConfig.c	(revision 12029)
+++ trunk/ippTools/src/warptoolConfig.c	(revision 12131)
@@ -60,5 +60,5 @@
     psMetadata *updaterunArgs = psMetadataAlloc();
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warp ID (required)", NULL);
+            "define warptool ID (required)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state (required)", NULL);
@@ -73,9 +73,7 @@
     psMetadata *addinputexpArgs = psMetadataAlloc();
     psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warp ID (required)", NULL);
-    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "define exposure tag (required)", NULL);
-    psMetadataAddS32(addinputexpArgs, PS_LIST_TAIL, "-cam_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
+            "define warptool ID (required)", NULL);
+    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-cam_id", 0,
+            "define camtool ID (required)", NULL);
     psMetadataAddBool(addinputexpArgs, PS_LIST_TAIL, "-magiced",  0,
             "has this exposure been magiced", false);
@@ -84,9 +82,7 @@
     psMetadata *expArgs = psMetadataAlloc();
     psMetadataAddStr(expArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warp ID (required)", NULL);
-    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "define exposure tag (required)", NULL);
-    psMetadataAddS32(expArgs, PS_LIST_TAIL, "-cam_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
+            "search by warptool ID", NULL);
+    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-cam_id", 0,
+            "search by camtool ID", NULL);
     psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -97,9 +93,7 @@
     psMetadata *imfileArgs = psMetadataAlloc();
     psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warp ID (required)", NULL);
-    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "define exposure tag (required)", NULL);
-    psMetadataAddS32(imfileArgs, PS_LIST_TAIL, "-cam_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
+            "search by warptool ID", NULL);
+    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-cam_id", 0,
+            "search by camtool ID", NULL);
     psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -119,10 +113,10 @@
     psMetadata *addoverlapArgs = psMetadataAlloc();
     psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0,
-            "skycell <-> imfile mapping description", NULL);
+            "path to skycell <-> imfile mapping file", NULL);
 
     // -scmap
     psMetadata *scmapArgs = psMetadataAlloc();
     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+            "search by warptool ID", NULL);
     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,
             "searcy by skycell ID", NULL);
@@ -137,5 +131,5 @@
     psMetadata *towarpedArgs = psMetadataAlloc();
     psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+            "search by warptool ID", NULL);
     psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -146,5 +140,5 @@
     psMetadata *addwarpedArgs = psMetadataAlloc();
     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warp ID (required)", NULL);
+            "define warptool ID (required)", NULL);
     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID (required)", NULL);
@@ -161,5 +155,5 @@
     psMetadata *warpedArgs = psMetadataAlloc();
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+            "search by warptool ID", NULL);
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID (required)", NULL);
@@ -168,6 +162,6 @@
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_tag", 0,
             "define exposure tag (required)", NULL);
-    psMetadataAddS32(warpedArgs, PS_LIST_TAIL, "-cam_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
+    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-cam_id", 0,
+            "define phase 3 version of exposure tag (required)", NULL);
     psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -286,5 +280,5 @@
     bool status = false;
     if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS32)atoi(str))) {
+        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
             psFree(config);