Changeset 6582 for branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c

Timestamp:

Mar 13, 2006, 11:50:51 PM (20 years ago)

Author:

Paul Price

Message:

Nearly all working; doesn't work on megacam split images yet.

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c (modified) (5 diffs)

branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c

@@ -187 +187 @@
     if (cell) {
         pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+        if (! hdu) {
+            return false;
+        }
         psMetadata *cameraFormat = hdu->format; // The camera format
         psMetadata *cellConfig = cell->config; // The camera configuration for this cell
@@ -197 +200 @@
             psMetadataItem *value = NULL; // The value of the concept
             if (conceptItem) {
-                // Check the SOURCE
-                psString nameSource = NULL; // String with the concept name and ".SOURCE" added
-                psStringAppend(&nameSource, "%s.SOURCE", name);
-                bool mdok = true;       // Status of MD lookup
-                psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
-                if (mdok && strlen(source) > 0 && strcasecmp(source, "VALUE") == 0) {
-                    value = psMemIncrRefCounter(conceptItem);
-                    conceptParse(spec, value, cameraFormat, target, NULL, NULL, cell);
-                } else if (source && (strlen(source) == 0 || strcasecmp(source, "HEADER") != 0)) {
-                    // We leave "HEADER" to pmConceptsReadFromHeader
-                    psError(PS_ERR_IO, true, "%s isn't HEADER or VALUE --- can't read %s\n", source, name);
-                    continue;
+                if (conceptItem->type == PS_DATA_STRING) {
+                    // Check the SOURCE
+                    psString nameSource = NULL; // String with the concept name and ".SOURCE" added
+                    psStringAppend(&nameSource, "%s.SOURCE", name);
+                    bool mdok = true;       // Status of MD lookup
+                    psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
+                    if (mdok && strlen(source) > 0 && strcasecmp(source, "VALUE") == 0) {
+                        value = psMemIncrRefCounter(conceptItem);
+                        conceptParse(spec, value, cameraFormat, target, NULL, NULL, cell);
+                    } else if (source && (strlen(source) == 0 || strcasecmp(source, "HEADER") != 0)) {
+                        // We leave "HEADER" to pmConceptsReadFromHeader
+                        psError(PS_ERR_IO, true, "%s isn't HEADER or VALUE --- can't read %s\n", source,
+                                name);
+                        continue;
+                    }
+                } else {
+                    // Another type --- should be OK
+                    conceptParse(spec, conceptItem, cameraFormat, target, NULL, NULL, cell);
                 }
             }
@@ -227 +236 @@
 {
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
+    if (!hdu) {
+        return false;
+    }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
@@ -256 +268 @@
 {
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
+    if (!hdu) {
+        return false;
+    }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
@@ -324 +339 @@
 {
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
+    if (!hdu) {
+        return false;
+    }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup