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

Timestamp:

Dec 3, 2006, 4:14:09 PM (20 years ago)

Author:

magnier

Message:

updated pmConfigReadRecipes to implement config inheritence

File:

• trunk/psModules/src/config/pmConfig.h (modified) (6 diffs)

trunk/psModules/src/config/pmConfig.h

@@ -9 +9 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-12-03 18:48:10 $
+/// @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-12-04 02:14:09 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -28 +28 @@
 /// psModules --- there is no need for the user to know about it.
 typedef enum {
-    P_PM_RECIPE_SOURCE_NONE        = 0x00, ///< None yet
-    P_PM_RECIPE_SOURCE_SITE        = 0x01, ///< Site configuration
-    P_PM_RECIPE_SOURCE_CAMERA      = 0x02, ///< Camera configuration
-    P_PM_RECIPE_SOURCE_CL          = 0x04, ///< Command-line
-    P_PM_RECIPE_SOURCE_SYMBOLIC    = 0x14, ///< Symbolic link, specified on command-line
-    P_PM_RECIPE_SOURCE_ALL         = 0xff  ///< All sources
-} p_pmRecipeSource;
+    PM_RECIPE_SOURCE_NONE        = 0x00, ///< None yet
+    PM_RECIPE_SOURCE_SITE        = 0x01, ///< Site configuration
+    PM_RECIPE_SOURCE_CAMERA      = 0x02, ///< Camera configuration
+    PM_RECIPE_SOURCE_CL          = 0x04, ///< Command-line
+    PM_RECIPE_SOURCE_SYMBOLIC    = 0x14, ///< Symbolic link, specified on command-line
+    PM_RECIPE_SOURCE_ALL         = 0xff  ///< All sources
+} pmRecipeSource;
 
 /// Configuration information
@@ -52 +52 @@
     int *argc;                          ///< Number of command-line arguments
     char **argv;                        ///< Command-line arguments (raw version)
+    char *defaultRecipe;  ///< name of top-level recipe for this program
     // Private members
-    p_pmRecipeSource recipesRead;       ///< Which recipe sources have been read
+    pmRecipeSource recipesRead;       ///< Which recipe sources have been read
     psMetadata *recipesSource;          ///< Where each recipe came from
 }
@@ -81 +82 @@
 /// psLib log, trace and time setups are also performed if specified in the site configuration.
 pmConfig *pmConfigRead(int *argc,       ///< Number of command-line arguments
-                       char **argv      ///< Array of command-line arguments
+                       char **argv, ///< Array of command-line arguments
+                       char *defaultRecipe ///< name of top-level recipe for this program
                       );
 
@@ -122 +124 @@
 /// Attempt to read recipes from the sources that are available but have not already been read.  Having read a
 /// recipe, attempt to resolve symbolic links that were specified on the command line.
-bool pmConfigReadRecipes(pmConfig *config ///< Configuration
+bool pmConfigReadRecipes(pmConfig *config, ///< Configuration
+                         pmRecipeSource source ///< desired sources for recipes
                         );
 
@@ -164 +167 @@
 psString pmConfigConvertFilename (char *filename, pmConfig *config);
 
+
+bool pmConfigLoadRecipeArguments (pmConfig *config);
+bool pmConfigLoadRecipeOptions (pmConfig *config, char *flag);
+
 #endif