Changeset 16724

Timestamp:

Feb 28, 2008, 1:21:31 PM (18 years ago)

Author:

jhoblitt

Message:

rename -definebyquery -> queue

Location:

trunk/ippTools/src

Files:

• stacktool.c (modified) (3 diffs)
• stacktool.h (modified) (1 diff)
• stacktoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/stacktool.c

@@ -31 +31 @@
 #include "stacktool.h"
 
-static bool definebyqueryMode(pxConfig *config);
+static bool queueMode(pxConfig *config);
 static bool definerunMode(pxConfig *config);
 static bool updaterunMode(pxConfig *config);
@@ -61 +61 @@
 
     switch (config->mode) {
-        MODECASE(STACKTOOL_MODE_DEFINEBYQUERY,      definebyqueryMode);
+        MODECASE(STACKTOOL_MODE_QUEUE,              queueMode);
         MODECASE(STACKTOOL_MODE_DEFINERUN,          definerunMode);
         MODECASE(STACKTOOL_MODE_UPDATERUN,          updaterunMode);
@@ -92 +92 @@
 
 
-static bool definebyqueryMode(pxConfig *config)
+static bool queueMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

trunk/ippTools/src/stacktool.h

@@ -25 +25 @@
 typedef enum {
     STACKTOOL_MODE_NONE           = 0x0,
-    STACKTOOL_MODE_DEFINEBYQUERY,
+    STACKTOOL_MODE_QUEUE,
     STACKTOOL_MODE_DEFINERUN,
     STACKTOOL_MODE_UPDATERUN,

trunk/ippTools/src/stacktoolConfig.c

@@ -46 +46 @@
 
     // -definebyquery
-    psMetadata *definebyqueryArgs = psMetadataAlloc();
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0,
+    psMetadata *queueArgs = psMetadataAlloc();
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0,
             "define workdir (required)", NULL);
-    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered",  0,
+    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-registered",  0,
             "time detrend run was registered", now);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type",  0,
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_exp_type",  0,
             "search for exp_type", "object");
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst",  0,
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_inst",  0,
             "search for camera", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope",  0,
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_telescope",  0,
             "search for telescope", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter",  0,
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_filter",  0,
             "search for filter", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri",  0,
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_uri",  0,
             "search for uri", NULL);
-    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
+    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
             "search for exposures by time (>=)", NULL);
-    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
+    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
             "search for exposures by time (<)", NULL);
-    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min",  0,
+    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_airmass_min",  0,
             "define min airmass", NAN);
-    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max",  0,
+    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_airmass_max",  0,
             "define max airmass", NAN);
-    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max",  0,
+    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max",  0,
             "define max fraction of saturated pixels", NAN);
-    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min",  0,
+    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_exp_time_min",  0,
             "define min exposure time", NAN);
-    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max",  0,
+    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_exp_time_max",  0,
             "define max exposure time", NAN);
-    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min",  0,
+    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_ccd_temp_min",  0,
             "define min ccd tempature", NAN);
-    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max",  0,
+    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_ccd_temp_max",  0,
             "define max ccd tempature", NAN);
-    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min",  0,
+    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_posang_min",  0,
             "define min rotator position angle", NAN);
-    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max",  0,
+    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_posang_max",  0,
             "define max rotator position angle", NAN);
-    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min",  0,
+    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_solang_min",  0,
             "define min solar angle", NAN);
-    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max",  0,
+    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_solang_max",  0,
             "define max solar angle", NAN);
 
-    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
 
@@ -194 +194 @@
     psMetadata *modes   = psMetadataAlloc();
 
-    PXOPT_ADD_MODE("-definebyquery", "Define a new stackRun by searching for warp IDs",
-        STACKTOOL_MODE_DEFINEBYQUERY,  definebyqueryArgs);
+    PXOPT_ADD_MODE("-queue", "Define a new stackRun by searching for warp IDs",
+        STACKTOOL_MODE_QUEUE,  queueArgs);
     PXOPT_ADD_MODE("-definerun",       "", STACKTOOL_MODE_DEFINERUN,      definerunArgs);
     PXOPT_ADD_MODE("-updaterun",       "", STACKTOOL_MODE_UPDATERUN,      updaterunArgs);