Changeset 18026

Timestamp:

Jun 9, 2008, 12:32:47 PM (18 years ago)

Author:

Paul Price

Message:

Treat the database like a header --- read it for "concepts" whenever we read the header.

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -98 +98 @@
     }
     if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
-                            PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
+                            PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE, true, NULL)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n");
         return false;
@@ -570 +570 @@
 
     // load in the concept information for this cell
-    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, NULL)) {
         //psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
         //return false;
@@ -659 +659 @@
     }
     if (success) {
-        if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) {
+        if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE,
+                                true, true, NULL)) {
             psError(PS_ERR_IO, false, "Failed to read concepts for chip.\n");
             return false;
@@ -689 +690 @@
     }
     if (success) {
-        if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+        if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, NULL)) {
             psError(PS_ERR_IO, false, "Failed to read concepts for FPA.\n");
             return false;
@@ -739 +740 @@
     // Make sure we have the information we need
     if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
-                            PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
+                            PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE, true, NULL)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n");
         return false;