Changeset 18336 for trunk/ippTools/src/warptoolConfig.c

Timestamp:

Jun 26, 2008, 3:39:54 PM (18 years ago)

Author:

jhoblitt

Message:

consitently handle *_id fields as numeric values instead of converting back of forth between ints and strings

File:

• trunk/ippTools/src/warptoolConfig.c (modified) (12 diffs)

trunk/ippTools/src/warptoolConfig.c

@@ -49 +49 @@
     // -definerun
     psMetadata *definerunArgs = psMetadataAlloc();
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-fake_id", 0,
-            "define camtool ID (required)", NULL);
+    psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0,
+            "define camtool ID (required)", 0);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0,
             "define mode (required)", NULL);
@@ -73 +73 @@
     psMetadata *updaterunArgs = psMetadataAlloc();
     // XXX need to allow multiple fake_ids
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
     // XXX need to allow multiple fake_ids
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-fake_id",  0,
-            "search by fake_id", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id",  0,
+            "search by fake_id", 0);
     // XXX need to allow multiple chip_ids
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-chip_id",  0,
-            "search by chip_id", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id",  0,
+            "search by chip_id", 0);
     // XXX need to allow multiple exp_ids
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_id",  0,
-            "search by exp_id", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id",  0,
+            "search by exp_id", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name",  0,
             "search by exp_name", NULL);
@@ -174 +174 @@
     // -exp
     psMetadata *expArgs = psMetadataAlloc();
-    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
-    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-fake_id", 0,
-            "search by camtool ID", NULL);
+    psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
+    psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0,
+            "search by camtool ID", 0);
     psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -185 +185 @@
     // -imfile
     psMetadata *imfileArgs = psMetadataAlloc();
-    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
-    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-fake_id", 0,
-            "search by camtool ID", NULL);
+    psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
+    psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0,
+            "search by camtool ID", 0);
     psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -196 +196 @@
     // -tooverlap
     psMetadata *tooverlapArgs = psMetadataAlloc();
-    psMetadataAddStr(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+    psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", 0);
     psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -207 +207 @@
     psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0,
             "path to skycell <-> imfile mapping file", NULL);
-    psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-warp_id",  0,
-            "set warp ID", NULL);
+    psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id",  0,
+            "set warp ID", 0);
     psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code",  0,
             "set fault code", 0);
@@ -214 +214 @@
     // -scmap
     psMetadata *scmapArgs = psMetadataAlloc();
-    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
+    psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,
             "search by skycell ID", NULL);
@@ -227 +227 @@
     // -towarped
     psMetadata *towarpedArgs = psMetadataAlloc();
-    psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
+    psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
     psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -236 +236 @@
     // -addwarped
     psMetadata *addwarpedArgs = psMetadataAlloc();
-    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warptool ID (required)", NULL);
+    psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warptool ID (required)", 0);
     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID (required)", NULL);
@@ -271 +271 @@
     // -warped
     psMetadata *warpedArgs = psMetadataAlloc();
-    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
+    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID", NULL);
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id",  0,
             "define tessellation ID", NULL);
-    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_id", 0,
-            "define exposure tag", NULL);
-    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-fake_id", 0,
-            "define phase 3 version of exposure tag", NULL);
+    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0,
+            "define exposure tag", 0);
+    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0,
+            "define phase 3 version of exposure tag", 0);
     psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -289 +289 @@
     psMetadata *revertwarpedArgs = psMetadataAlloc();
     // XXX need to allow multiple fake_ids
-    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warptool ID", NULL);
+    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warptool ID", 0);
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "search by skycell ID", NULL);
@@ -296 +296 @@
             "searcy by tessellation ID", NULL);
     // XXX need to allow multiple fake_ids
-    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-fake_id",  0,
-            "search by fake_id", NULL);
+    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id",  0,
+            "search by fake_id", 0);
     // XXX need to allow multiple chip_ids
-    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-chip_id",  0,
-            "search by chip_id", NULL);
+    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id",  0,
+            "search by chip_id", 0);
     // XXX need to allow multiple exp_ids
-    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_id",  0,
-            "search by exp_id", NULL);
+    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id",  0,
+            "search by exp_id", 0);
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name",  0,
             "search by exp_name", NULL);