Changeset 21314

Timestamp:

Feb 5, 2009, 9:41:50 AM (17 years ago)

Author:

bills

Message:

in pmConfigRead parse -image_id and -source_id arguments, save the values
in the pmConfig structure and when createing an output pmFPAfile copy
the values to the file

Location:

trunk/psModules/src

Files:

• camera/pmFPAfileDefine.c (modified) (1 diff)
• config/pmConfig.c (modified) (2 diffs)
• config/pmConfig.h (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -208 +208 @@
     file->camera = psMemIncrRefCounter(camera);
     file->cameraName = psMemIncrRefCounter(cameraName);
+
+    // Copy the file id valuves if they have been set in the config
+    if (config->sourceId) {
+        file->sourceId = config->sourceId;
+    }
+    if (config->imageId) {
+        file->imageId = config->imageId;
+    }
 
     // XXX this seems a bit of a hack: use the cameraName to determine the mosaic level...

trunk/psModules/src/config/pmConfig.c

@@ -156 +156 @@
     // the file structure is used to carry pmFPAfiles
     config->files = psMetadataAlloc ();
+
+    config->sourceId = 0;
+    config->imageId = 0;
     return config;
 }
@@ -917 +920 @@
             }
 
+            psArgumentRemove(argNum, argc, argv);
+        }
+    }
+
+    argNum = psArgumentGet(*argc, argv, "-image_id");
+    if (argNum > 0) {
+        psArgumentRemove(argNum, argc, argv);
+        if (argNum >= *argc) {
+            psWarning("-image_id command-line switch provided without the required id number");
+        } else {
+            if (!sscanf(argv[argNum], "%" PRId64, &config->imageId)) {
+                psWarning("Failed to parse image_id value %s", argv[argNum]);
+            }
+            psArgumentRemove(argNum, argc, argv);
+        }
+    }
+
+    argNum = psArgumentGet(*argc, argv, "-source_id");
+    if (argNum > 0) {
+        psArgumentRemove(argNum, argc, argv);
+        if (argNum >= *argc) {
+            psWarning("-source_id command-line switch provided without the required id number");
+        } else {
+            if (!sscanf(argv[argNum], "%" PRId64, &config->sourceId)) {
+                psWarning("Failed to parse image_id value %s", argv[argNum]);
+            }
             psArgumentRemove(argNum, argc, argv);
         }

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-24 20:51:57 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-05 19:41:50 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -56 +56 @@
     int traceFD;                        ///< File descriptor for trace messages
     int logFD;                          ///< File descriptor for log messages
+    psS64 sourceId;                    ///< Database source id for output file
+    psS64 imageId;                     ///< Database image id for output file
 } pmConfig;