Changeset 7200

Timestamp:

May 24, 2006, 2:14:45 PM (20 years ago)

Author:

jhoblitt

Message:

fix stacMode()'s masking behavior

File:

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

trunk/ippTools/src/dettool.c

@@ -535 +535 @@
 
     // remove detNormalizedImfiles
-    psArray *masterImfiles = detNormalizedImfileSelectRowObjects(
+    psArray *normalizedImfiles = detNormalizedImfileSelectRowObjects(
         config->dbh, config->where, 0);
     // XXX trace the not found case
-    if (masterImfiles) {
+    if (normalizedImfiles) {
         for (long i = 0; i < psArrayLength(stackedImfiles); i++) {
-            for (long j = 0; j < psArrayLength(masterImfiles); j++) {
-                if (strcmp(
+            for (long j = 0; j < psArrayLength(normalizedImfiles); j++) {
+                if ((
+                ((detStackedImfileRow *)stackedImfiles->data[i])->det_id
+                ==
+                ((detNormalizedImfileRow *)normalizedImfiles->data[j])->det_id
+                ) && (strcmp(
                 ((detStackedImfileRow *)stackedImfiles->data[i])->class_id,
-                ((detNormalizedImfileRow *)masterImfiles->data[j])->class_id)
-                == 0) {
+               ((detNormalizedImfileRow *)normalizedImfiles->data[j])->class_id)
+                == 0)) {
                     // remove the detStackedImfiles from the list
                     psArrayRemove(stackedImfiles, stackedImfiles->data[i]);
@@ -552 +556 @@
             }
         }
-        psFree(masterImfiles);
+        psFree(normalizedImfiles);
     }