Changeset 15092

Timestamp:

Sep 28, 2007, 2:53:53 PM (19 years ago)

Author:

Paul Price

Message:

Need to update the CONTENT line in FILE in the camera format --- doesn't take {CHIP.NAME} any more.

File:

• trunk/psModules/src/config/pmConfigCamera.c (modified) (3 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -606 +606 @@
         }
         psMetadataAddStr(file, PS_LIST_TAIL, "CONTENT", PS_META_REPLACE, "Key to CONTENTS menu",
-                         "{CHIP.NAME}");
+                         "PS_CNTNT");
         // Don't need CELL.NAME for chip-mosaicked camera
         if (psMetadataLookup(file, "CELL.NAME")) {
@@ -629 +629 @@
             if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "CHIP")) {
                 // ensure the value of CONTENT in the FILE section has the right value
-                psMetadataAddStr(file, PS_LIST_TAIL, "CONTENT", PS_META_REPLACE, "Key to CONTENTS menu", "{CHIP.NAME}");
+                psMetadataAddStr(file, PS_LIST_TAIL, "CONTENT", PS_META_REPLACE, "Key to CONTENTS menu",
+                                 "PS_CNTNT");
 
                 // List the chipName:chipType for each chip.
@@ -692 +693 @@
                     psStringAppend(&content, "%s:_mosaicChip ", fpaItem->name);
                     psMetadataAddStr(contents, PS_LIST_TAIL, fpaItem->name, 0, NULL, content);
-                    psFree(content);
+                    psFree(content);
                 }
                 psFree(fpaIter);