Changeset 11034

Timestamp:

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

Author:

jhoblitt

Message:

strip out p2tool -quick & -define stubs

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (10 diffs)
• chiptool.h (modified) (1 diff)
• chiptoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/chiptool.c

@@ -29 +29 @@
 #include "p2tool.h"
 
-static bool quickMode(pxConfig *config);
-static bool defineMode(pxConfig *config);
 static bool pendingimfileMode(pxConfig *config);
 static bool addprocessedimfileMode(pxConfig *config);
@@ -57 +55 @@
 
     switch (config->mode) {
-        MODECASE(P2TOOL_MODE_QUICK,                 quickMode);
-        MODECASE(P2TOOL_MODE_DEFINE,                defineMode);
         MODECASE(P2TOOL_MODE_PENDINGIMFILE,         pendingimfileMode);
         MODECASE(P2TOOL_MODE_ADDPROCESSEDIMFILE,    addprocessedimfileMode);
@@ -84 +80 @@
 
     exit(EXIT_FAILURE);
-}
-
-static bool quickMode(pxConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
-
-    psArray *rawFrames = rawScienceFrameSearch(config);
-    if (!rawFrames) {
-        psError(PS_ERR_UNKNOWN, false, "no rawScienceFrames found");
-        return false;
-    }
-    bool status = rawScienceFramePrint(stdout, config, rawFrames);
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "rawScienceFramePrint() failed");
-        return false;
-    }
-
-    return true;
-}
-
-static bool defineMode(pxConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
-#if 0
-
-    psArray *rawFrames = rawScienceFrameSearch(config);
-    if (!rawFrames) {
-        psError(PS_ERR_UNKNOWN, false, "no rawScienceFrames found");
-        return false;
-    }
-    psArray *pendingFrames = p2PendingFrameSearch(config);
-    // XXX compare raw frames to pending frames and remove duplicate
-    // frames from the raw set.  This may not be quiet right as it's
-    // possible (likely?) that a rawScienceExp is inserted into the
-    // dbh prior to /ALL/ of that exposure's Imfiles
-    if (pendingFrames) {
-        for (long i = 0; i < rawFrames->n; i++) {
-            rawScienceFrame *rawFrame = rawFrames->data[i];
-            for (long j = 0; j < pendingFrames->n; j++) {
-                p2PendingFrame *pendingFrame = pendingFrames->data[j];
-                if (strcmp(rawFrame->exposure->exp_tag,
-                           pendingFrame->exposure->exp_tag) == 0) {
-                    psArrayRemoveData(rawFrames, rawFrame);
-                    // dec the counter as the array just got shorter
-                    // and we don't want to skip elemnts
-                    i--;
-                    break;
-                }
-            }
-        }
-
-        psFree(pendingFrames);
-
-        psArray *doneFrames = p2searchDoneFrames(config);
-        if (doneFrames && (rawFrames->n > 0)) {
-            for (long i = 0; i < rawFrames->n; i++) {
-                rawScienceFrame *rawFrame = rawFrames->data[i];
-                for (long j = 0; j < pendingFrames->n; j++) {
-                    p2DoneFrame *doneFrame = pendingFrames->data[j];
-                    if (strcmp(rawFrame->exposure->exp_tag,
-                               doneFrame->exposure->exp_tag) == 0) {
-                        psArrayRemoveData(rawFrames, rawFrame);
-                        // dec the counter as the array just got shorter
-                        // and we don't want to skip elemnts
-                        i--;
-                        break;
-                    }
-                }
-            }
-
-            psFree(doneFrames);
-        }
-    }
-
-    if (!rawFrames->n > 0) {
-        psError(PS_ERR_UNKNOWN, false, "no unprocessed rawScienceFrames found");
-        psFree(rawFrames);
-        return false;
-    }
-
-    bool status = p2insertPendingFrames(config, rawFrames);
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false,"p2insertPendingFrames() failed");
-        return false;
-    }
-
-#endif
-    return true;
 }
 
@@ -257 +165 @@
 }
 
+
 static bool addprocessedimfileMode(pxConfig *config)
 {
@@ -558 +467 @@
 }
 
+
 static bool maskedMode(pxConfig *config)
 {
@@ -605 +515 @@
 }
 
+
 static bool unblockMode(pxConfig *config)
 {
@@ -630 +541 @@
     return true;
 }
+
 
 static bool p2ProcessedCompleteExp(pxConfig *config)
@@ -746 +658 @@
 }
 
+
 static p2ProcessedImfileRow *p2PendingToProcessedImfile(pxConfig *config, p2PendingImfileRow *imfile)
 {
@@ -838 +751 @@
 }
 
+
 static p2ProcessedExpRow *p2PendingToProcessedExp(pxConfig *config, p2PendingExpRow *pendingExp)
 {
@@ -850 +764 @@
 }
 
+
 static p3PendingExpRow *p2PendingToP3PendingExp(pxConfig *config, p2PendingExpRow *pendingExp)
 {

trunk/ippTools/src/chiptool.h

@@ -25 +25 @@
 typedef enum {
     P2TOOL_MODE_NONE      = 0x0,
-    P2TOOL_MODE_QUICK,
-    P2TOOL_MODE_DEFINE,
     P2TOOL_MODE_PENDINGIMFILE,
     P2TOOL_MODE_ADDPROCESSEDIMFILE,

trunk/ippTools/src/chiptoolConfig.c

@@ -38 +38 @@
         goto FAIL;
     }
-
-    // -quick
-    psMetadata *quickArgs = psMetadataAlloc();
-    
-    // -define
-    psMetadata *defineArgs = psMetadataAlloc();
 
     // -pendingimfile
@@ -154 +148 @@
 
     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("-addprocessedimfile",P2TOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs);