Changeset 10967 for trunk/psModules/src/concepts/pmConceptsWrite.c

Timestamp:

Jan 8, 2007, 12:31:41 PM (19 years ago)

Author:

Paul Price

Message:

Fixed bugs with writing concepts to DEFAULTS --- code was all confused! Added function to return a list of concepts defined at a particular level, pmConceptsList.

File:

• trunk/psModules/src/concepts/pmConceptsWrite.c (modified) (6 diffs)

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -119 +119 @@
         if (spec->format) {
             formatted = spec->format(concept, cameraFormat, fpa, chip, cell);
+        } else if (strcmp(concept->name, spec->blank->name) != 0) {
+            // Adjust so that the name is correct
+            formatted = psMetadataItemCopy(concept);
+            psFree(formatted->name);
+            formatted->name = psStringCopy(spec->blank->name);
         } else {
+            // Can get away with merely incrementing the reference counter
             formatted = psMemIncrRefCounter((const psPtr)concept);
         }
@@ -294 +300 @@
     PS_ASSERT_PTR_NON_NULL(concepts, false);
 
-    pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+    pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
         return false;
@@ -316 +322 @@
                 // It's a menu --- need to look up the .DEPEND
                 psString dependName = NULL; // The concept name with ".DEPEND" on the end
-                psStringAppend(&dependName, ".DEPEND");
+                psStringAppend(&dependName, "%s.DEPEND", defaultItem->name);
                 psString dependKey = psMetadataLookupStr(&mdok, defaults, dependName); // The keyword
-                psFree(dependName);
                 if (!mdok || !dependKey || strlen(dependKey) == 0) {
                     psLogMsg(__func__, PS_LOG_WARN, "Can't find %s in the DEFAULTS for %s --- ignored.\n",
                              dependName, name);
+                    psFree(dependName);
                     continue;
                 }
-                psString dependValue = psMetadataLookupStr(&mdok, concepts, dependName); // The value
-                if (!mdok || !dependKey || strlen(dependKey) == 0) {
+                psString dependValue = psMetadataLookupStr(&mdok, concepts, dependKey); // The value
+                if (!mdok || !dependValue || strlen(dependValue) == 0) {
                     psLogMsg(__func__, PS_LOG_WARN, "Concept %s specified by %s isn't of type STR -- "
-                             "ignored.\n", name, dependName);
+                             "ignored.\n", dependKey, dependName);
+                    psFree(dependName);
                     continue;
                 }
-                conceptItem = psMetadataLookup(defaultItem->data.V, dependValue);
+                psFree(dependName);
+                // Get the actual item of interest, and correct the name to match the concept name
+                defaultItem = psMetadataItemCopy(psMetadataLookup(defaultItem->data.md, dependValue));
+                psFree(defaultItem->name);
+                defaultItem->name = psStringCopy(name);
             } else {
-                conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
-            }
+                psMemIncrRefCounter(defaultItem);
+            }
+            conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
             psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
             if (!formatted) {
@@ -342 +354 @@
                          "format, but the values don't match.\n", name);
             }
+            psFree(defaultItem);
             psFree(formatted);
         }
@@ -356 +369 @@
     PS_ASSERT_PTR_NON_NULL(concepts, false);
 
-    pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+    pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
         return false;
@@ -408 +421 @@
     #else
 
-    pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+    pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
         return false;