Changeset 7351 for trunk/ippTools/src/dettool.c

Timestamp:

Jun 5, 2006, 2:37:36 PM (20 years ago)

Author:

jhoblitt

Message:

finish implementation of -addresid

File:

• trunk/ippTools/src/dettool.c (modified) (3 diffs)

trunk/ippTools/src/dettool.c

@@ -1390 +1390 @@
     // check det_id, exp_id, & class_id against the input rawImfiles
     
+    // XXX what we really want here is to do a join but psDB doesn't support
+    // that type of operation 
     // we have to generate our own where claus as we want to exclude -stats
     // from the search
@@ -1404 +1406 @@
         return false;
     }
-    if (!psMetadataAddStr(where, PS_LIST_TAIL, "class_id", 0, "==", class_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
-        psFree(where);
-        return false;
-    }
 
     psArray *rawImfiles = searchRawImfiles(config, where);
@@ -1419 +1416 @@
     }
 
-    // database sanity check
-    if (psArrayLength(rawImfiles) > 1) {
-        // abort
+    // iterate through rawImfiles looking for a match to our class_id
+    bool found = false;
+    for (long i = 0; i < psArrayLength(rawImfiles); i++) {
+        if (strcmp(class_id,
+                ((rawImfileRow *)rawImfiles->data[i])->class_id) == 0) {
+            found = true; 
+            break;
+        }
+    }
+
+    if (!found) {
+        psError(PS_ERR_UNKNOWN, true,
+    "det_id %s, exp_id %s, class_id %s does not corespond to an input imfile",
+            det_id, exp_id, class_id);
+        return false;
+    }
+
+    // create a new detResidImfileRow and insert it
+    detResidImfileAnalysisRow *residImfile = detResidImfileAnalysisRowAlloc(
+                (psS32)atol(det_id),
+                exp_id,
+                class_id,
+                stats,
+                recipe
+            );
+
+    if (!detResidImfileAnalysisInsertObject(config->dbh, residImfile)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
     }