Changeset 18908 for trunk/psModules/src/config/pmConfig.h

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/pmConfig.h (modified) (3 diffs)

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-05 02:16:06 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-05 03:45:56 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -40 +40 @@
     psMetadata *site;                   ///< Site configuration
     psMetadata *system;                 ///< System configuration
-    psMetadata *complete;               ///< Full merged configuration
     psMetadata *camera;                 ///< Camera specification
     psString cameraName;                ///< Camera name
@@ -86 +85 @@
 /// Read a configuration file
 ///
-/// Read a metadata configuration file into the supplied metadata.  Produce an error and return false if
-/// there's a problem.
+/// Read a metadata configuration file into the supplied metadata.  Produce an error and
+/// return false if there's a problem.
 bool pmConfigFileRead(psMetadata **config, ///< Config to output
                       const char *name, ///< Name of file
                       const char *description ///< Description of file
-                     );
+    );
+
+/// Ingest a configuration file
+///
+/// Ingest a metadata configuration file into the supplied metadata item, if required.  Produce an error and
+/// return false if there's a problem.
+bool pmConfigFileIngest(psMetadataItem *item, // Item into which to read file
+                        const char *description // Description, for error messages
+    );
 
 /// Validate a header against the camera format