Changeset 12575 for trunk/ppImage/src/ppImageArguments.c

Timestamp:

Mar 23, 2007, 2:23:04 PM (19 years ago)

Author:

Paul Price

Message:

Recent changes to the recipe parsing has revealed that certain options should be pushed onto the config->arguments, rather than the recipe.

File:

• trunk/ppImage/src/ppImageArguments.c (modified) (4 diffs)

trunk/ppImage/src/ppImageArguments.c

@@ -36 +36 @@
 
     if (psArgumentGet (argc, argv, "-version")) {
-        psString version;
-        version = ppImageVersionLong();   fprintf (stdout, "%s\n", version); psFree (version);
-        version = ppStatsVersionLong();   fprintf (stdout, "%s\n", version); psFree (version);
-        version = psphotVersionLong();    fprintf (stdout, "%s\n", version); psFree (version);
-        version = psastroVersionLong();   fprintf (stdout, "%s\n", version); psFree (version);
-        version = psModulesVersionLong(); fprintf (stdout, "%s\n", version); psFree (version);
-        version = psLibVersionLong();     fprintf (stdout, "%s\n", version); psFree (version);
-        exit (0);
+        psString version;
+        version = ppImageVersionLong();   fprintf (stdout, "%s\n", version); psFree (version);
+        version = ppStatsVersionLong();   fprintf (stdout, "%s\n", version); psFree (version);
+        version = psphotVersionLong();    fprintf (stdout, "%s\n", version); psFree (version);
+        version = psastroVersionLong();   fprintf (stdout, "%s\n", version); psFree (version);
+        version = psModulesVersionLong(); fprintf (stdout, "%s\n", version); psFree (version);
+        version = psLibVersionLong();     fprintf (stdout, "%s\n", version); psFree (version);
+        exit (0);
     }
 
@@ -63 +63 @@
     if ((argnum = psArgumentGet(argc, argv, "-stat"))) {
         psArgumentRemove(argnum, &argc, argv);
-        psMetadataAddStr(options, PS_LIST_TAIL, "STATS", PS_META_REPLACE,
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "STATS", PS_META_REPLACE,
                          "Filename for summary statistics", argv[argnum]);
         psArgumentRemove(argnum, &argc, argv);
@@ -70 +70 @@
     if ((argnum = psArgumentGet(argc, argv, "-isfringe"))) {
         psArgumentRemove(argnum, &argc, argv);
-        psMetadataAddBool(options, PS_LIST_TAIL, "INPUT_IS_FRINGE", PS_META_REPLACE,
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "INPUT_IS_FRINGE", PS_META_REPLACE,
                           "Input is fringe image", true);
     }
@@ -76 +76 @@
     // the following options override the PPIMAGE recipe options
 
-    // recipe option: -usemask : override MASK setting in phase2.recipe
+    // recipe option: -usemask : override MASK setting in recipe
     if ((argnum = psArgumentGet(argc, argv, "-usemask"))) {
-        psArgumentRemove (argnum, &argc, argv);
-        psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
-        psArgumentRemove (argnum, &argc, argv);
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddBool(options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
+        psArgumentRemove(argnum, &argc, argv);
     }