Changeset 11033 for trunk/ippTools/src/chiptoolConfig.c

Timestamp:

Jan 11, 2007, 12:11:08 PM (19 years ago)

Author:

jhoblitt

Message:

rework fault handling:

remove p2PendingImfile.fault
add p2ProcessedImfile.fault
remove -pendingimfile -fault
add -addprocessedimfile -code
add -processedimfile mode
rename -faultimfile -> -updatedprocessedimfile

File:

• trunk/ippTools/src/chiptoolConfig.c (modified) (4 diffs)

trunk/ippTools/src/chiptoolConfig.c

@@ -47 +47 @@
     // -pendingimfile
     psMetadata *pendingimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst",  0,
-            "define camera of interest", NULL);
-    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter",  0,
-            "define filter of interest", NULL); 
     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
             "define exposure ID", NULL);
@@ -57 +53 @@
     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,
             "define class ID", NULL);
+    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst",  0,
+            "define camera of interest", NULL);
+    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter",  0,
+            "define filter of interest", NULL); 
     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-uri",  0,
             "define URL", NULL);
     psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,
-        "limit result set to N items", 0);
-    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-faulted",  0,
-        "only return imfiles with a fault status set", false);
+            "limit result set to N items", 0);
     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
@@ -86 +84 @@
     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b2_uri",  0,
             "define banana 2", NULL);
-
-    // -faultimfile
-    psMetadata *faultimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
-        "search by exposure ID", NULL);
-    psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class",  0,
-        "search by class", NULL);
-    psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class_id",  0,
-        "search by class ID", NULL);
-    psMetadataAddS8(faultimfileArgs, PS_LIST_TAIL, "-code",  0,
-        "set fault code (required)", 0);
+    psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
+            "set fault code (required)", 0);
+
+    // -processedimfile
+    psMetadata *processedimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
+            "define exposure ID", NULL);
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class",  0,
+            "define class", NULL);
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
+            "define class ID", NULL);
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst",  0,
+            "define camera of interest", NULL);
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter",  0,
+            "define filter of interest", NULL); 
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-uri",  0,
+            "define URL", NULL);
+    psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
+    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,
+            "only return imfiles with a fault status set", false);
+    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
+
+    // -updateprocessedimfile
+    psMetadata *updateprocessedimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
+            "search by exposure ID", NULL);
+    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class",  0,
+            "search by class", NULL);
+    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
+            "search by class ID", NULL);
+    psMetadataAddS8(updateprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
+            "set fault code (required)", 0);
 
 
@@ -133 +154 @@
 
     psMetadata *argSets = psMetadataAlloc();
-    PXTOOL_MODE("-quick",       P2TOOL_MODE_QUICK,        quickArgs);
-    PXTOOL_MODE("-define",      P2TOOL_MODE_DEFINE,       defineArgs);
-    PXTOOL_MODE("-pendingimfile", P2TOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
+    PXTOOL_MODE("-quick",           P2TOOL_MODE_QUICK,          quickArgs);
+    PXTOOL_MODE("-define",          P2TOOL_MODE_DEFINE,         defineArgs);
+    PXTOOL_MODE("-pendingimfile",   P2TOOL_MODE_PENDINGIMFILE,  pendingimfileArgs);
     PXTOOL_MODE("-addprocessedimfile",P2TOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs);
-    PXTOOL_MODE("-faultimfile",  P2TOOL_MODE_FAULTIMFILE,   faultimfileArgs);
-    PXTOOL_MODE("-block",        P2TOOL_MODE_BLOCK,          blockArgs);
-    PXTOOL_MODE("-masked",       P2TOOL_MODE_MASKED,         maskedArgs);
-    PXTOOL_MODE("-unblock",      P2TOOL_MODE_UNBLOCK,        unblockArgs);
+    PXTOOL_MODE("-processedimfile",P2TOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
+    PXTOOL_MODE("-updateprocessedimfile",P2TOOL_MODE_UPDATEPROCESSEDIMFILE,    updateprocessedimfileArgs);
+    PXTOOL_MODE("-block",           P2TOOL_MODE_BLOCK,          blockArgs);
+    PXTOOL_MODE("-masked",          P2TOOL_MODE_MASKED,         maskedArgs);
+    PXTOOL_MODE("-unblock",         P2TOOL_MODE_UNBLOCK,        unblockArgs);
 
     bool argErr = false;