Changeset 8661 for trunk/ippTools/src/chiptool.c

Timestamp:

Aug 28, 2006, 2:21:28 PM (20 years ago)

Author:

jhoblitt

Message:

restrict the scope of whereClaus in updateimfileMode()

File:

• trunk/ippTools/src/chiptool.c (modified) (11 diffs)

trunk/ippTools/src/chiptool.c

@@ -12 +12 @@
 static bool pendingimfileMode(pxConfig *config);
 static bool addprocessedimfileMode(pxConfig *config);
-static p2DoneImfileRow *p2pendingToDoneImfile(pxConfig *config, p2PendingImfileRow *imfile);
+static p2ProcessedImfileRow *p2pendingToProcessedImfile(pxConfig *config, p2PendingImfileRow *imfile);
+static p2ProcessedExpRow *p2PendingToProcessedExp(pxConfig *config, p2PendingExpRow *pendingExp);
 
 # define MODECASE(caseName, func) \
@@ -70 +71 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
+#if 0
 
     psArray *rawFrames = rawScienceFrameSearch(config);
@@ -132 +134 @@
     }
 
+#endif
     return true;
 }
+
 
 static bool pendingimfileMode(pxConfig *config)
@@ -166 +170 @@
 static bool addprocessedimfileMode(pxConfig *config)
 {
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
-
-    // -uri is always required
-    bool status = false;
-    psString uri = psMetadataLookupStr(&status, config->args, "-uri");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
-        return NULL;
-    }
-    if (!uri) {
-        psError(PS_ERR_UNKNOWN, true, "-uri is required");
-        return NULL;
-    }
-    // get exp_id/class/class_id/uri from the CLI
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // select * from p2ProcessedImfiles
+    // where
+    // exp_id & class_id are not in p2PendingImfile
+
     // add the completed imfile to
-    // the p2DoneImfile tables
+    // the p2ProcessedeImfile tables
     // remove corresponding entries from the
     // p2PendingImfile table 
     // check to see if any p2PendingExps have no
     // associated p2PendingImfiles 
-    // if so move the p2PendingExp(s) to p2DoneExp
+    // if so move the p2PendingExp(s) to p2ProcessedExp
+    
+    psString query = psStringCopy(
+        "SELECT DISTINCT"
+        "   p2PendingImfile.*"
+        " FROM p2PendingImfile "
+        " LEFT JOIN p2ProcessedImfile"
+        "   USING(exp_id, class_id)"
+        " WHERE"
+        "  p2ProcessedImfile.exp_id IS NULL"
+        "  AND p2ProcessedImfile.class_id IS NULL"
+        );
+    {
+        psMetadata *where = psMetadataAlloc();
+        bool status = false;        
+        psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
+            psFree(query);
+            return false;
+        }
+        if (exp_id) {
+            if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==", exp_id)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+                psFree(where);
+                psFree(query);
+                return false;
+            }
+        }
+        psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -class_id");
+            psFree(query);
+            return false;
+        }
+        if (class_id) {
+            if (!psMetadataAddStr(where, PS_LIST_TAIL, "class_id", 0, "==", class_id)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
+                psFree(where);
+                psFree(query);
+                return false;
+            }
+        }
+
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p2PendingImfile");
+        psFree(where)
+        if (whereClaus) {
+            psStringAppend(&query, " AND %s", whereClause);
+            psFree(whereClause);
+        }
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        // XXX check psError here
+        psError(PS_ERR_UNKNOWN, false, "no pending rawDetrendExp rows found");
+        return false;
+    }
 
     // find pending
@@ -205 +264 @@
     // insert into done
     for (long i = 0; i < psArrayLength(pendingImfiles); i++) {
-        p2DoneImfileRow *imfile = p2pendingToDoneImfile(config, pendingImfiles->data[0]);
+        p2ProcessedImfileRow *imfile = p2pendingToProcessedImfile(config, pendingImfiles->data[0]);
         if (!imfile) {
             // rollback
@@ -211 +270 @@
                 psError(PS_ERR_UNKNOWN, false, "database error");
             }
-            psError(PS_ERR_UNKNOWN, false, "failed to convert p2PendingImfile to p2DoneImfile");
+            psError(PS_ERR_UNKNOWN, false, "failed to convert p2PendingImfile to p2ProcessedImfile");
             psFree(pendingImfiles);
             return false;
         }
-        if (!p2DoneImfileInsertObject(config->dbh, imfile)) {
+        if (!p2ProcessedImfileInsertObject(config->dbh, imfile)) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -280 +339 @@
             }
 
-            p2DoneExpRow *doneExp = p2pendingToDoneExp(pendingExp);
+            p2ProcessedExpRow *doneExp = p2PendingToProcessedExp(config, pendingExp);
             if (!doneExp) {
                 // rollback
@@ -286 +345 @@
                     psError(PS_ERR_UNKNOWN, false, "database error");
                 }
-                psError(PS_ERR_UNKNOWN, false, "p2PendingExp -> p2DoneExp failed");
+                psError(PS_ERR_UNKNOWN, false, "p2PendingExp -> p2ProcessedExp failed");
                 psFree(pendingExps);
                 return false;
             }
-            if (!p2DoneExpInsertObject(config->dbh, doneExp)) {
+            if (!p2ProcessedExpInsertObject(config->dbh, doneExp)) {
                 // rollback
                 if (!psDBRollback(config->dbh)) {
@@ -308 +367 @@
     psFree(pendingExps);
 
-    // point of no return for p2PendingImfile -> p2DoneImfile 
-    // point of no return for p2PendingExp -> p2DoneExp
+    // point of no return for p2PendingImfile -> p2ProcessedImfile 
+    // point of no return for p2PendingExp -> p2ProcessedExp
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -330 +389 @@
 }
 
-// XXX the filename layout is defined by this code
-static p2DoneImfileRow *p2pendingToDoneImfile(pxConfig *config, p2PendingImfileRow *imfile)
+static p2ProcessedImfileRow *p2pendingToProcessedImfile(pxConfig *config, p2PendingImfileRow *imfile)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -340 +398 @@
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
-        return NULL;
+        return false;
     }
     if (!uri) {
         psError(PS_ERR_UNKNOWN, true, "-uri is required");
-        return NULL;
-    }
-
-    return p2DoneImfileRowAlloc(
+        return false;
+    }
+
+    psString recipe = psMetadataLookupStr(&status, config->args, "-recip");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -recip");
+        return false;
+    }
+    if (!recipe) {
+        psError(PS_ERR_UNKNOWN, true, "-recip is required");
+        return false;
+    }
+
+    psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
+        return false;
+    }
+    if (isnan(bg)) {
+        psError(PS_ERR_UNKNOWN, true, "-bg is required");
+        return false;
+    }
+
+    psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
+        return false;
+    }
+    if (isnan(bg_stdev)) {
+        psError(PS_ERR_UNKNOWN, true, "-bg_stdev is required");
+        return false;
+    }
+
+    psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
+        return false;
+    }
+    if (isnan(bg_mean_stdev)) {
+        psError(PS_ERR_UNKNOWN, true, "-bg_mean_stdev is required");
+        return false;
+    }
+
+    // optional
+    psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri");
+        return false;
+    }
+
+    psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri");
+        return false;
+    }
+
+    return p2ProcessedImfileRowAlloc(
         imfile->exp_id,
         imfile->class_id,
         uri,
-        "my recipe", // recipe
+        recipe,
+        bg,
+        bg_stdev,
+        bg_mean_stdev,
+        b1_uri,
+        b2_uri,
         imfile->p1_version,
         imfile->p2_version
     );
 }
+
+static p2ProcessedExpRow *p2PendingToProcessedExp(pxConfig *config, p2PendingExpRow *pendingExp)
+{
+    PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
+
+    return p2ProcessedExpRowAlloc(
+        pendingExp->exp_id,
+        "my recipe",
+        pendingExp->p1_version,
+        pendingExp->p2_version
+    );
+}