Changeset 11257 for trunk/psModules/src/concepts/pmConcepts.c

Timestamp:

Jan 23, 2007, 5:54:00 PM (19 years ago)

Author:

Paul Price

Message:

Concepts functions fail if any of the components fail.

File:

• trunk/psModules/src/concepts/pmConcepts.c (modified) (10 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -266 +266 @@
     bool success = conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db, fpa->concepts);
     if (chip) {
-        success |= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db, chip->concepts);
+        success &= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db, chip->concepts);
     }
     if (cell) {
-        success |= conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, db, cell->concepts);
+        success &= conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, db, cell->concepts);
     }
 
@@ -284 +284 @@
 
 
-// XXX should these be &= not |= ??
 bool pmConceptsReadFPA(pmFPA *fpa, pmConceptSource source, bool propagateDown, psDB *db)
 {
@@ -295 +294 @@
             pmChip *chip = chips->data[i]; // Chip of interest
             if (chip) {
-                success |= pmConceptsReadChip(chip, source, false, true, db);
+                success &= pmConceptsReadChip(chip, source, false, true, db);
             }
         }
@@ -313 +312 @@
             pmChip *chip = chips->data[i];  // Chip of interest
             if (chip && !chip->hdu) {
-                success |= pmConceptsWriteChip(chip, source, false, true, db);
+                success &= pmConceptsWriteChip(chip, source, false, true, db);
             }
         }
@@ -336 +335 @@
                                 chip->concepts);
     if (propagateUp) {
-        success |= conceptsRead(&conceptsFPA, fpa, chip, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
+        success &= conceptsRead(&conceptsFPA, fpa, chip, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
     }
     if (propagateDown) {
@@ -343 +342 @@
             pmCell *cell = cells->data[i];  // Cell of interest
             if (cell) {
-                success |= pmConceptsReadCell(cell, source, false, db);
+                success &= pmConceptsReadCell(cell, source, false, db);
             }
         }
@@ -358 +357 @@
     bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
     if (propagateUp && !fpa->hdu) {
-        success |= conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, db, fpa->concepts);
+        success &= conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, db, fpa->concepts);
     }
     if (propagateDown) {
@@ -365 +364 @@
             pmCell *cell = cells->data[i];  // Cell of interest
             if (cell && !cell->hdu) {
-                success |= pmConceptsWriteCell(cell, source, false, db);
+                success &= pmConceptsWriteCell(cell, source, false, db);
             }
         }
@@ -389 +388 @@
                                 cell->concepts);
     if (propagateUp) {
-        success |= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db,
+        success &= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db,
                                 chip->concepts);
-        success |= conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db,
+        success &= conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db,
                                 fpa->concepts);
     }
@@ -408 +407 @@
     if (propagateUp) {
         if (!chip->hdu) {
-            success |= conceptsWrite(&conceptsChip, fpa, chip, cell, source, db, chip->concepts);
+            success &= conceptsWrite(&conceptsChip, fpa, chip, cell, source, db, chip->concepts);
             if (!fpa->hdu) {
-                success |= conceptsWrite(&conceptsFPA, fpa, chip, cell, source, db, fpa->concepts);
+                success &= conceptsWrite(&conceptsFPA, fpa, chip, cell, source, db, fpa->concepts);
             }
         }