Changeset 18526 for trunk/ippTools/src/magictoolConfig.c

Timestamp:

Jul 14, 2008, 6:21:12 PM (18 years ago)

Author:

Paul Price

Message:

Adding magictool -mask (to get the URI for the mask information out). Getting magictool -addmask to update the mask state to 'stop'. Need to be better about magicRun.state and fault throughout.

File:

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

trunk/ippTools/src/magictoolConfig.c

@@ -112 +112 @@
     psMetadataAddS16(inputtreeArgs, PS_LIST_TAIL, "-code",  0, "set fault code", 0);
 
-    // -node
-    psMetadata *nodeArgs = psMetadataAlloc();
-    psMetadataAddStr(nodeArgs, PS_LIST_TAIL, "-magic_id", 0,
+    // -inputs
+    psMetadata *inputsArgs = psMetadataAlloc();
+    psMetadataAddStr(inputsArgs, PS_LIST_TAIL, "-magic_id", 0,
             "search by magictool ID", NULL);
-    psMetadataAddStr(nodeArgs, PS_LIST_TAIL, "-node",  0,
+    psMetadataAddStr(inputsArgs, PS_LIST_TAIL, "-node",  0,
             "search by symbolic node name", NULL);
-    psMetadataAddU64(nodeArgs, PS_LIST_TAIL, "-limit",  0,
-            "limit result set to N items", 0);
-    psMetadataAddBool(nodeArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddU64(inputsArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
+    psMetadataAddBool(inputsArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
 
@@ -155 +155 @@
     psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-uri",  0, "define URI", NULL);
     psMetadataAddS32(addmaskArgs, PS_LIST_TAIL, "-streaks",  0, "define number of streaks", 0);
+    psMetadataAddS16(addmaskArgs, PS_LIST_TAIL, "-code",  0, "set fault code", 0);
+
+    // -mask
+    psMetadata *maskArgs = psMetadataAlloc();
+    psMetadataAddStr(maskArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID", NULL);
+    psMetadataAddU64(maskArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
+    psMetadataAddBool(maskArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
 
     psFree(now);
@@ -169 +176 @@
     PXOPT_ADD_MODE("-inputtree",       "", MAGICTOOL_MODE_INPUTTREE,       inputtreeArgs);
     PXOPT_ADD_MODE("-toprocess",       "", MAGICTOOL_MODE_TOPROCESS,       toprocessArgs);
+    PXOPT_ADD_MODE("-inputs",          "", MAGICTOOL_MODE_INPUTS,          inputsArgs);
     PXOPT_ADD_MODE("-addresult",       "", MAGICTOOL_MODE_ADDRESULT,       addresultArgs);
-    PXOPT_ADD_MODE("-node",            "", MAGICTOOL_MODE_NODE,            nodeArgs);
     PXOPT_ADD_MODE("-tomask",          "", MAGICTOOL_MODE_TOMASK,          tomaskArgs);
     PXOPT_ADD_MODE("-addmask",         "", MAGICTOOL_MODE_ADDMASK,         addmaskArgs);
+    PXOPT_ADD_MODE("-mask",            "", MAGICTOOL_MODE_MASK,            maskArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
@@ -219 +227 @@
     psString str = NULL;
     bool status = false;
-    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
-        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
+    if ((str = psMetadataLookupStr(&status, config->args, "-magic_id"))) {
+        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "magic_id", 0, "==", (psS64)atoll(str))) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item magic_id");
             psFree(config);
             return NULL;