Changeset 18908 for trunk/psModules/src/config/pmConfigDump.c

Timestamp:

Aug 4, 2008, 5:45:56 PM (18 years ago)

Author:

Paul Price

Message:

Removing use of pmConfig.complete in favour of proper use of what's now called pmConfigFileIngest (used to be metadataItemReadFile). The idea is that configuration files are read in to the metadata item where they are defined. The result is that the .ipprc (pmConfig.user) can be dumped to a file, and will contain all the other stuff as well, so that it can be loaded in (using '-ipprc XXX' on the command-line) and we have a fully defined configuration without having to load anything else (which may have changed). The problem with pmConfig.complete was that it produced multiple unsynchronised versions: you could access and change data in pmConfig.complete without pmConfig.user or pmConfig.system being updated. This check in restores things to the way they used to be, where everything is synchronised.

File:

• trunk/psModules/src/config/pmConfigDump.c (modified) (2 diffs)

trunk/psModules/src/config/pmConfigDump.c

@@ -64 +64 @@
       PS_ASSERT_PTR_NON_NULL(config, false);
 
-      psMetadata *cameras = psMetadataLookupMetadata(NULL, config->complete, "CAMERAS"); // Known cameras
+      psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // Known cameras
       if (!cameras) {
           psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find CAMERAS in the system configuration.\n");
@@ -146 +146 @@
     }
 
-    if (!psMetadataConfigWrite(config->complete, filename)) {
+    if (!psMetadataConfigWrite(config->user, filename)) {
         psError(PS_ERR_IO, false, "Unable to dump configuration to %s", filename);
         psFree(filename);