Changeset 5789

Timestamp:

Dec 13, 2005, 6:30:21 PM (20 years ago)

Author:

Paul Price

Message:

Made changes from Josh, with some modification

Location:

trunk/archive/scripts/src/phase2

Files:

• pmFPARead.c (modified) (6 diffs)
• pmFPARead.h (modified) (1 diff)
• pmFPAWrite.c (modified) (4 diffs)

trunk/archive/scripts/src/phase2/pmFPARead.c

@@ -219 +219 @@
 
 // Translate a name from the configuration file, containing something like "%a_%d" to a real value
-psString p_pmFPATranslateName(psString name, // The name to translate
-                              pmCell *cell // The cell for which to translate
+psString p_pmFPATranslateName(const psString name, // The name to translate
+                              const pmCell *cell // The cell for which to translate
     )
 {
@@ -338 +338 @@
 }
 
+// Get filename and extension out of "somefile.fits:ext"
+psString p_pmFPATranslateFileExt(psString *extName, // Extension name, to be returned
+                                 const psString name, // The string to be translated and then parsed
+                                 const pmCell *cell // The cell
+    )
+{
+    psString filenameExt = p_pmFPATranslateName(name, cell);
+    const char *colon = strchr(filenameExt, ':'); // Pointer to a colon in the filename-extn
+    psString filename = NULL;           // The filename
+    if (extName && *extName) {
+        psFree(*extName);
+    }
+    if (extName) {
+        *extName = NULL;
+    }
+
+    if (colon) {
+        filename = psStringNCopy(filenameExt, strlen(filenameExt) - strlen(colon));
+        if (strlen(colon) > 1) {
+            if (extName) {
+                *extName = psStringCopy(colon + 1);
+            }
+        }
+    } else {
+        filename = psMemIncrRefCounter(filenameExt);
+    }
+
+    return filename;
+}
+
 // Read a mask into the FPA
 bool pmFPAReadMask(pmFPA *fpa,          // FPA to read into
@@ -386 +416 @@
                     if (strcasecmp(sourceType, "FILE") == 0) {
                         // Source is a file (with optional extension, e.g., "myMaskFile.fits:thisExt"
-                        psString filenameExt = p_pmFPATranslateName(name, cell);
-                        char *colon = strchr(filenameExt, ':'); // Pointer to a colon in the filename-extn
-                        psString filename = NULL; // The filename
-                        psString extname = NULL;// The extenstion name
-                        if (colon) {
-                            filename = psStringNCopy(filenameExt, strlen(filenameExt) - strlen(colon));
-                            if (strlen(colon) > 1) {
-                                extname = psStringCopy(colon + 1);
-                            }
-                        } else {
-                            filename = psMemIncrRefCounter(filenameExt);
-                        }
+                        psString extname = NULL; // Extension name
+                        psString filename = p_pmFPATranslateFileExt(&extname, name, cell); // The filename
 
                         psFree(maskSource);
@@ -410 +430 @@
                         psFree(filename);
                         psFree(extname);
-                        psFree(filenameExt);
                     } else if (strncasecmp(sourceType, "EXT", 3) == 0) {
                         // Source is an extension in the original file
@@ -536 +555 @@
                     if (strcasecmp(sourceType, "FILE") == 0) {
                         // Source is a file (with optional extension, e.g., "myWeightFile.fits:thisExt"
-                        psString filenameExt = p_pmFPATranslateName(name, cell);
-                        char *colon = strchr(filenameExt, ':'); // Pointer to a colon in the filename-extn
-                        psString filename = NULL; // The filename
-                        psString extname = NULL;// The extenstion name
-                        if (colon) {
-                            filename = psStringNCopy(filenameExt, strlen(filenameExt) - strlen(colon));
-                            if (strlen(colon) > 1) {
-                                extname = psStringCopy(colon + 1);
-                            }
-                        } else {
-                            filename = psMemIncrRefCounter(filenameExt);
-                        }
+                        psString extname = NULL; // Extension name
+                        psString filename = p_pmFPATranslateFileExt(&extname, name, cell); // The filename
 
                         psFree(weightSource);
@@ -560 +569 @@
                         psFree(filename);
                         psFree(extname);
-                        psFree(filenameExt);
                     } else if (strncasecmp(sourceType, "EXT", 3) == 0) {
                         // Source is an extension in the original file

trunk/archive/scripts/src/phase2/pmFPARead.h

@@ -4 +4 @@
 #include "pmFPA.h"
 
-bool pmFPARead(pmFPA *fpa,              // FPA to read into
-               psFits *fits,            // FITS file from which to read
-               psMetadata *phu,         // Primary header
-               psDB *db                 // Database handle, for concept ingest
+bool pmFPARead(pmFPA *fpa,              // FPA to read into
+               psFits *fits,            // FITS file from which to read
+               psMetadata *phu,         // Primary header
+               psDB *db                 // Database handle, for concept ingest
     );
 
-psString p_pmFPATranslateName(psString name, // The name to translate
-                              pmCell *cell // The cell for which to translate
+psString p_pmFPATranslateName(const psString name, // The name to translate
+                              const pmCell *cell // The cell for which to translate
     );
 
-bool pmFPAReadMask(pmFPA *fpa,          // FPA to read into
-                   psFits *source       // Source FITS file (for the original data)
+psString p_pmFPATranslateFileExt(psString *extName, // Extension name, to be returned
+                                 const psString filenameExt, // The string to parse into filename and ext
+                                 const pmCell *cell // The cell
     );
 
-bool pmFPAReadWeight(pmFPA *fpa,        // FPA to read into
-                     psFits *source     // Source FITS file (for the original data)
+bool pmFPAReadMask(pmFPA *fpa,          // FPA to read into
+                   psFits *source       // Source FITS file (for the original data)
+    );
+
+bool pmFPAReadWeight(pmFPA *fpa,        // FPA to read into
+                     psFits *source     // Source FITS file (for the original data)
     );
 

trunk/archive/scripts/src/phase2/pmFPAWrite.c

@@ -124 +124 @@
                     if (strcasecmp(sourceType, "FILE") == 0) {
                         // Source is a file (with optional extension, e.g., "myMaskFile.fits:thisExt"
-                        psString filenameExt = p_pmFPATranslateName(name, cell);
-                        char *colon = strchr(filenameExt, ':'); // Pointer to a colon in the filename-extn
-                        psString filename = NULL; // The filename
-                        psString extname = NULL;// The extenstion name
-                        if (colon) {
-                            filename = psStringNCopy(filenameExt, strlen(filenameExt) - strlen(colon));
-                            if (strlen(colon) > 1) {
-                                extname = psStringCopy(colon + 1);
-                            }
-                        } else {
-                            filename = psMemIncrRefCounter(filenameExt);
-                        }
-
+                        psString extname = NULL; // Extension name
+                        psString filename = p_pmFPATranslateFileExt(&extname, name, cell); // The filename
                         psFree(maskDest);
                         maskDest = psFitsOpen(filename, "rw");
@@ -144 +133 @@
                         psFree(filename);
                         psFree(extname);
-                        psFree(filenameExt);
                     } else if (strncasecmp(sourceType, "EXT", 3) == 0) {
                         // Source is an extension in the original file
@@ -227 +215 @@
                     if (strcasecmp(sourceType, "FILE") == 0) {
                         // Source is a file (with optional extension, e.g., "myWeightFile.fits:thisExt"
-                        psString filenameExt = p_pmFPATranslateName(name, cell);
-                        char *colon = strchr(filenameExt, ':'); // Pointer to a colon in the filename-extn
-                        psString filename = NULL; // The filename
-                        psString extname = NULL;// The extenstion name
-                        if (colon) {
-                            filename = psStringNCopy(filenameExt, strlen(filenameExt) - strlen(colon));
-                            if (strlen(colon) > 1) {
-                                extname = psStringCopy(colon + 1);
-                            }
-                        } else {
-                            filename = psMemIncrRefCounter(filenameExt);
-                        }
+                        psString extname = NULL; // Extension name
+                        psString filename = p_pmFPATranslateFileExt(&extname, name, cell); // The filename
 
                         psFree(weightDest);
@@ -247 +225 @@
                         psFree(filename);
                         psFree(extname);
-                        psFree(filenameExt);
                     } else if (strncasecmp(sourceType, "EXT", 3) == 0) {
                         // Source is an extension in the original file