Changeset 11292 for trunk/psModules/src/objects

Timestamp:

Jan 25, 2007, 2:05:18 PM (19 years ago)

Author:

jhoblitt

Message:

add first pass nebclient support/linking
change pmConfigConvertFilename() to accept a boolean create [file] parameter

Location:

trunk/psModules/src/objects

Files:

• pmPSF_IO.c (modified) (3 diffs)
• pmSourceIO.c (modified) (6 diffs)

trunk/psModules/src/objects/pmPSF_IO.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-03 18:48:10 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 00:05:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -204 +204 @@
     case PM_FPA_FILE_PSF:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        realname = pmConfigConvertFilename (filename, config);
+        bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+        realname = pmConfigConvertFilename (filename, config, create);
 
         psMetadata *psfData = pmPSFtoMetadata (NULL, psf);
@@ -308 +309 @@
     case PM_FPA_FILE_PSF:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        realname = pmConfigConvertFilename (filename, config);
+        bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+        realname = pmConfigConvertFilename (filename, config, create);
 
         psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, realname, FALSE);

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 03:20:13 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 00:05:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -182 +182 @@
         return false;
 
+    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+
     switch (file->type) {
     case PM_FPA_FILE_RAW:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        realname = pmConfigConvertFilename (filename, config);
+        realname = pmConfigConvertFilename (filename, config, create);
         pmSourcesWriteRAW (sources, realname);
         psFree (realname);
@@ -193 +195 @@
     case PM_FPA_FILE_OBJ:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        realname = pmConfigConvertFilename (filename, config);
+        realname = pmConfigConvertFilename (filename, config, create);
         pmSourcesWriteOBJ (sources, realname);
         psFree (realname);
@@ -201 +203 @@
     case PM_FPA_FILE_SX:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        realname = pmConfigConvertFilename (filename, config);
+        realname = pmConfigConvertFilename (filename, config, create);
         pmSourcesWriteSX (sources, realname);
         psFree (realname);
@@ -211 +213 @@
         hdu = pmFPAviewThisHDU (view, file->fpa);
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        realname = pmConfigConvertFilename (filename, config);
+        realname = pmConfigConvertFilename (filename, config, create);
 
         // copy the header to an output header, add the output header data
@@ -452 +454 @@
         }
 
-        psString realname = pmConfigConvertFilename (file->filename, config);
+        bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+        psString realname = pmConfigConvertFilename (file->filename, config, create);
 
         file->fits = psFitsOpen (realname, "r");