Changeset 19399 for trunk/psModules

Timestamp:

Sep 5, 2008, 12:41:58 PM (18 years ago)

Author:

bills

Message:

Get configuration dump file name from command line option. If no file
is provided, no dump is created

Location:

trunk/psModules/src/config

Files:

• pmConfigDump.c (modified) (2 diffs)
• pmConfigDump.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfigDump.c

@@ -106 +106 @@
 
 
-bool pmConfigDump(const pmConfig *config, const pmFPA *source, const char *outroot)
+bool pmConfigDump(const pmConfig *config, const pmFPA *source, const char *filename)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_STRING_NON_EMPTY(outroot, false);
-
-    pmFPAview *view = source ? pmFPAviewTop(source) : pmFPAviewAlloc(0);// View to top level
-    if (!view) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to determine top view for FPA.");
-        return false;
-    }
-
-    pmFPALevel level = pmFPAviewLevel(view); // Level for view
-    const char *levelString;    // String for level
-    switch (level) {
-      case PM_FPA_LEVEL_FPA:
-        levelString = "FPA";
-        break;
-      case PM_FPA_LEVEL_CHIP:
-        levelString = "CHIP";
-        break;
-      case PM_FPA_LEVEL_CELL:
-        levelString = "CELL";
-        break;
-      default:
-        psError(PS_ERR_UNKNOWN, false, "Bad FPA level: %x", level);
-        psFree(view);
-        return false;
-    }
-
-    psMetadata *dumpRules = psMetadataLookupMetadata(NULL, config->system, "CONFIG.DUMP"); // Name rules
-    if (!dumpRules) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find CONFIG.DUMP in system configuration");
-        psFree(view);
-        return false;
-    }
-
-    const char *rule = psMetadataLookupStr(NULL, dumpRules, levelString); // Rule for output file name
-    if (!rule) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find %s in CONFIG.DUMP in system configuration",
-                levelString);
-        psFree(view);
-        return false;
-    }
-
-    psString ruleCopy = psStringCopy(rule); // Copy of rule, so we can have our way with it
-
-    psStringSubstitute(&ruleCopy, outroot, "{OUTPUT}");
-
-    if (strstr(ruleCopy, "{PROGRAM}")) {
-        // basename() is allowed to muck with the values, so need to copy
-        psString program = psStringCopy(config->program); // Copy of program name
-        const char *progName = basename(program); // Basename of program
-        psStringSubstitute(&ruleCopy, progName, "{PROGRAM}");
-        psFree(program);
-    }
-
-    if (strstr(ruleCopy, "{TIMESTAMP}")) {
-        psTime *time = psTimeGetNow(PS_TIME_UTC); // Current time
-        psString timeString = psTimeToISO(time); // ISO-formatted time
-        psFree(time);
-        psStringSubstitute(&ruleCopy, timeString, "{TIMESTAMP}");
-        psFree(timeString);
-    }
-
-    psString filename = pmFPANameFromRule(ruleCopy, source, view); // Filename for dump
-    psFree(ruleCopy);
-    psFree(view);
-    if (!filename) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to determine dump filename");
-        return false;
-    }
+    PS_ASSERT_STRING_NON_EMPTY(filename, false);
 
     psString resolved = pmConfigConvertFilename(filename, config, true, false); // Resolved filename
@@ -182 +115 @@
     if (!psMetadataConfigWrite(config->user, resolved)) {
         psError(PS_ERR_IO, false, "Unable to dump configuration to %s", filename);
-        psFree(filename);
         psFree(resolved);
         return false;
     }
 
-    psFree(filename);
     psFree(resolved);
 

trunk/psModules/src/config/pmConfigDump.h

@@ -4 +4 @@
  *  @author Paul Price, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-13 02:32:35 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-09-05 22:41:58 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -30 +30 @@
 /// Dump the configuration to a file
 ///
-/// The output file is designated by the CONFIG.DUMP metadata in the system configuration, keyed by the FPA
-/// level of the supplied source.  In addition to the standard concept interpolation, additional
-/// interpolations are defined: "{PROGRAM}" is interpolated to the program name, "{TIMESTAMP}" is interpolated
-/// to the current time (ISO format).
 bool pmConfigDump(const pmConfig *config, ///< Configuration to dump
-                  const pmFPA *source,  ///< Source FPA, defines the level for the file rule
-                  const char *outroot   ///< Output root name
+                  const pmFPA *source,    ///< Source FPA, defines the level for the file rule
+                  const char *filename    ///< Output file name
     );