Changeset 18259

Timestamp:

Jun 20, 2008, 7:39:19 PM (18 years ago)

Author:

eugene

Message:

call pmConceptsBlank... if needed (conceptsRead is SOURCE_NONE)

File:

• branches/eam_branch_20080620/psModules/src/camera/pmFPA.c (modified) (4 diffs)

branches/eam_branch_20080620/psModules/src/camera/pmFPA.c

@@ -303 +303 @@
 
     tmpCell->concepts = psMetadataAlloc();
-    tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name)) {
         psErrorClear();
         psWarning("Could not add CELL.NAME to metadata.");
     }
-    pmConceptsBlankCell(tmpCell);
+    tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
+    // XXX does this work?  moved to conceptsRead... pmConceptsBlankCell(tmpCell);
 
     return tmpCell;
@@ -342 +342 @@
 
     tmpChip->concepts = psMetadataAlloc();
-    tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name)) {
         psErrorClear();
         psWarning("Could not add CHIP.NAME %s to concepts.", name);
     }
-    pmConceptsBlankChip(tmpChip);
+    tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
+    // XXX does this work?  moved to conceptsRead... pmConceptsBlankChip(tmpChip);
     return tmpChip;
 }
@@ -372 +372 @@
 
     tmpFPA->concepts = psMetadataAlloc();
-    tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE;
-    pmConceptsBlankFPA(tmpFPA);
-
     if (!psMetadataAddStr(tmpFPA->concepts, PS_LIST_TAIL, "FPA.CAMERA", PS_META_REPLACE,
                           "Camera name (according to configuration)", cameraName)) {
@@ -380 +377 @@
         psWarning("Could not add FPA.CAMERA %s to concepts.", cameraName);
     }
+    tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE;
+    // XXX does this work?  moved to conceptsRead... pmConceptsBlankFPA(tmpFPA);
 
     // this may be somewhat pedantic, but it makes these things consistent