Changeset 8292

Timestamp:

Aug 11, 2006, 4:20:19 PM (20 years ago)

Author:

jhoblitt

Message:

rename p0search -> p0tool

Location:

trunk/ippTools/src

Files:

• Makefile.am (modified) (3 diffs)
• regtool.c (modified) (2 diffs)
• regtool.h (modified) (1 diff)
• regtoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/Makefile.am

@@ -2 +2 @@
         pxadmin \
         pzsearch \
-        p0search \
+        p0tool \
         p2search \
         dettool \
@@ -17 +17 @@
         pzgetimfiles.h \
         pzsearch.h \
-        p0search.h \
+        p0tool.h \
         p1search.h \
         p2search.h \
@@ -46 +46 @@
     pzsearchConfig.c
 
-p0search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
-p0search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
-p0search_SOURCES = \
-    p0search.c \
-    p0searchConfig.c
+p0tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p0tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+p0tool_SOURCES = \
+    p0tool.c \
+    p0toolConfig.c
 
 p1search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)

trunk/ippTools/src/regtool.c

@@ -6 +6 @@
 
 #include "pxtools.h"
-#include "p0search.h"
+#include "p0tool.h"
 
 static bool pendingexpMode(pxConfig *config);
@@ -32 +32 @@
     psLibInit(NULL);
 
-    pxConfig *config = p0searchConfig(NULL, argc, argv);
+    pxConfig *config = p0toolConfig(NULL, argc, argv);
 
     switch (config->mode) {
-        MODECASE(P0SEARCH_MODE_PENDINGEXP,      pendingexpMode);
-        MODECASE(P0SEARCH_MODE_PENDINGIMFILE,   pendingimfileMode);
-        MODECASE(P0SEARCH_MODE_UPDATEEXP,       updateexpMode);
-        MODECASE(P0SEARCH_MODE_UPDATEIMFILE,    updateimfileMode);
-        MODECASE(P0SEARCH_MODE_RAWIMFILE,       rawimfileMode);
+        MODECASE(P0TOOL_MODE_PENDINGEXP,      pendingexpMode);
+        MODECASE(P0TOOL_MODE_PENDINGIMFILE,   pendingimfileMode);
+        MODECASE(P0TOOL_MODE_UPDATEEXP,       updateexpMode);
+        MODECASE(P0TOOL_MODE_UPDATEIMFILE,    updateimfileMode);
+        MODECASE(P0TOOL_MODE_RAWIMFILE,       rawimfileMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");

trunk/ippTools/src/regtool.h

@@ -1 @@
-#ifndef P0SEARCH_H
-#define P0SEARCH_H 1
+#ifndef P0TOOL_H
+#define P0TOOL_H 1
 
 #include "pxtools.h"
 
 typedef enum {
-    P0SEARCH_MODE_NONE      = 0x0,
-    P0SEARCH_MODE_PENDINGEXP,
-    P0SEARCH_MODE_PENDINGIMFILE,
-    P0SEARCH_MODE_UPDATEEXP,
-    P0SEARCH_MODE_UPDATEIMFILE,
-    P0SEARCH_MODE_RAWIMFILE
-} p0searchMode;
+    P0TOOL_MODE_NONE      = 0x0,
+    P0TOOL_MODE_PENDINGEXP,
+    P0TOOL_MODE_PENDINGIMFILE,
+    P0TOOL_MODE_UPDATEEXP,
+    P0TOOL_MODE_UPDATEIMFILE,
+    P0TOOL_MODE_RAWIMFILE
+} p0toolMode;
 
-pxConfig *p0searchConfig(pxConfig *config, int argc, char **argv);
+pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv);
 
-#endif // P0SEARCH_H
+#endif // P0TOOL_H

trunk/ippTools/src/regtoolConfig.c

@@ -7 +7 @@
 
 #include "pxtools.h"
-#include "p0search.h"
+#include "p0tool.h"
 
 // this function can not fail -- exits on error
-pxConfig *p0searchConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();
@@ -146 +146 @@
 
     // find which mode we're running under
-    PXTOOL_MODE("-pendingexp",   P0SEARCH_MODE_PENDINGEXP,  pendingexpArgs);
-    PXTOOL_MODE("-pendingimfile",P0SEARCH_MODE_PENDINGIMFILE,pendingimfileArgs);
-    PXTOOL_MODE("-updateexp",    P0SEARCH_MODE_UPDATEEXP,   updateexpArgs);
-    PXTOOL_MODE("-updateimfile", P0SEARCH_MODE_UPDATEIMFILE,updateimfileArgs);
-    PXTOOL_MODE("-rawimfile",    P0SEARCH_MODE_RAWIMFILE,   rawimfileArgs);
+    PXTOOL_MODE("-pendingexp",   P0TOOL_MODE_PENDINGEXP,  pendingexpArgs);
+    PXTOOL_MODE("-pendingimfile",P0TOOL_MODE_PENDINGIMFILE,pendingimfileArgs);
+    PXTOOL_MODE("-updateexp",    P0TOOL_MODE_UPDATEEXP,   updateexpArgs);
+    PXTOOL_MODE("-updateimfile", P0TOOL_MODE_UPDATEIMFILE,updateimfileArgs);
+    PXTOOL_MODE("-rawimfile",    P0TOOL_MODE_RAWIMFILE,   rawimfileArgs);
 
     bool argErr = false;
-    if (config->mode == P0SEARCH_MODE_NONE) {
+    if (config->mode == P0TOOL_MODE_NONE) {
         argErr = true;
         fprintf (stderr, "mode argument is required\n");
@@ -162 +162 @@
 
     if (argErr) {
-        printf("\nPan-STARRS Phase 0 Search Tool\n");
+        printf("\nPan-STARRS Phase 0 Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
         printf(" <mode> : [-pendingexp|-pendingimfile|-updateexp|-updateimfile|-rawimfile]\n\n");