Changeset 7920

Timestamp:

Jul 17, 2006, 2:56:49 PM (20 years ago)

Author:

Paul Price

Message:

Only attempt to read recipes from site and camera if we know the site and camera.

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-14 20:12:20 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-18 00:56:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -714 +714 @@
 
     // Read the recipe file names from the site configuration and camera configuration
-    if (!(config->recipesRead & P_PM_RECIPE_SOURCE_SITE)) {
+    if (config->site && !(config->recipesRead & P_PM_RECIPE_SOURCE_SITE)) {
         if(!loadRecipes(config, config->site, P_PM_RECIPE_SOURCE_SITE, "site configuration")) {
             psError(PS_ERR_IO, false, "Failed to read recipes from site config");
@@ -724 +724 @@
         }
     }
-    if (!(config->recipesRead & P_PM_RECIPE_SOURCE_CAMERA)) {
+    if (config->camera && !(config->recipesRead & P_PM_RECIPE_SOURCE_CAMERA)) {
         if (!loadRecipes(config, config->camera, P_PM_RECIPE_SOURCE_CAMERA, "camera configuration")) {
             psError(PS_ERR_IO, false, "Failed to read recipes from camera config");