Changeset 6955 for trunk/psModules/src/astrom

Timestamp:

Apr 21, 2006, 5:20:16 PM (20 years ago)

Author:

Paul Price

Message:

Making psDB optional, for when we don't compile psLib with mysql

Location:

trunk/psModules/src/astrom

Files:

• pmConcepts.h (modified) (1 diff)
• pmConceptsRead.c (modified) (2 diffs)
• pmConceptsRead.h (modified) (1 diff)
• pmConceptsWrite.c (modified) (2 diffs)
• pmConceptsWrite.h (modified) (1 diff)
• pmFPARead.h (modified) (1 diff)

trunk/psModules/src/astrom/pmConcepts.h

@@ -3 +3 @@
 
 #include "pslib.h"
-
 #include "pmFPA.h"
-
 
 // Function to call to parse a concept once it has been read

trunk/psModules/src/astrom/pmConceptsRead.c

@@ -258 +258 @@
                                )
 {
+    #ifdef OMIT_PSDB
+    return false;
+    #else
+
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
@@ -364 +368 @@
     }
     return false;
+    #endif
 }
 

trunk/psModules/src/astrom/pmConceptsRead.h

@@ -2 +2 @@
 #define PM_CONCEPTS_READ_H
 
+#include "pslib.h"
 #include "pmFPA.h"
-
 
 bool pmConceptsReadFromCamera(psMetadata *specs, // The concept specifications

trunk/psModules/src/astrom/pmConceptsWrite.c

@@ -404 +404 @@
                               )
 {
+    #ifdef OMIT_PSDB
+    return false;
+    #else
+
     pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
     if (!hdu) {
@@ -519 +523 @@
     }
     return false;
+    #endif
 }
 

trunk/psModules/src/astrom/pmConceptsWrite.h

@@ -4 +4 @@
 #include "pslib.h"
 #include "pmFPA.h"
-
-
 
 bool pmConceptsWriteToCamera(psMetadata *specs, // The concept specifications

trunk/psModules/src/astrom/pmFPARead.h

@@ -4 +4 @@
 #include "pslib.h"
 #include "pmFPA.h"
-
 
 bool pmReadoutReadNext(pmReadout *readout, // Readout into which to read