Changeset 9115

Timestamp:

Oct 2, 2006, 2:39:54 PM (20 years ago)

Author:

jhoblitt

Message:

rename -raw -> -toprocess
stub out a new -raw

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (3 diffs)
• dettool.h (modified) (1 diff)
• dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/dettool.c

@@ -17 +17 @@
 static bool inputMode(pxConfig *config);
 static bool rawMode(pxConfig *config);
+static bool toprocessMode(pxConfig *config);
 //static bool selectrunMode(pxConfig *config);
 //static bool selectMode(pxConfig *config);
@@ -84 +85 @@
         MODECASE(DETTOOL_MODE_INPUT,            inputMode);
         MODECASE(DETTOOL_MODE_RAW,              rawMode);
+        MODECASE(DETTOOL_MODE_TOPROCESS,        toprocessMode);
 //        MODECASE(DETTOOL_MODE_SELECTRUN, selectrunMode);
 //        MODECASE(DETTOOL_MODE_SELECT, selectMode);
@@ -793 +795 @@
 
 static bool rawMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    return true;
+}
+
+static bool toprocessMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

trunk/ippTools/src/dettool.h

@@ -12 +12 @@
     DETTOOL_MODE_INPUT,
     DETTOOL_MODE_RAW,
+    DETTOOL_MODE_TOPROCESS,
 //    DETTOOL_MODE_SELECTRUN,
 //    DETTOOL_MODE_SELECT,

trunk/ippTools/src/dettoolConfig.c

@@ -104 +104 @@
     psMetadataAddBool(inputArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
-
+ 
     // -raw
     psMetadata *rawArgs = psMetadataAlloc();
-    psMetadataAddStr(rawArgs, PS_LIST_TAIL, "-det_id",  0,
+    psMetadataAddBool(rawArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
+
+    // -toprocess
+    psMetadata *toprocessArgs = psMetadataAlloc();
+    psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-det_id",  0,
         "search for detrend ID", NULL);
-    psMetadataAddStr(rawArgs, PS_LIST_TAIL, "-exp_tag",  0,
+    psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-exp_tag",  0,
         "search for exp ID", NULL);
-    psMetadataAddStr(rawArgs, PS_LIST_TAIL, "-class_id",  0,
+    psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-class_id",  0,
         "search for class ID", NULL);
-    psMetadataAddBool(rawArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddBool(toprocessArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
     
@@ -532 +537 @@
     PXTOOL_MODE("-definebyquery",DETTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs);
     PXTOOL_MODE("-raw",             DETTOOL_MODE_RAW,           rawArgs);
+    PXTOOL_MODE("-toprocess",       DETTOOL_MODE_TOPROCESS,     toprocessArgs);
     PXTOOL_MODE("-runs",            DETTOOL_MODE_RUNS,          runsArgs);
 //    PXTOOL_MODE("-selectrun",       DETTOOL_MODE_SELECTRUN,     selectrunArgs);