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

Timestamp:

Jun 27, 2006, 2:49:13 PM (20 years ago)

Author:

Paul Price

Message:

Fixing up the process of reading recipes from the site and camera configurations, and the command line. Now supports multiple calls to pmConfigReadRecipes, only loading the appropriate data each time.

File:

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

trunk/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-24 03:25:14 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-28 00:49:13 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13 +13 @@
 
 #include "pslib.h"
+
+// What recipe sources have been read so far?
+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_ALL    = 0x07    // All sources
+} p_pmRecipeSource;
 
 // Configuration information
@@ -25 +34 @@
     int argc;                           // Number of command-line arguments
     char **argv;                        // Command-line arguments (raw version)
+    // Private members
+    p_pmRecipeSource recipesRead;       // Which recipe sources have been read
+    psMetadata *recipesSource;          // Where each recipe came from
 }
 pmConfig;