Changeset 4158

Timestamp:

Jun 8, 2005, 11:07:59 AM (21 years ago)

Author:

desonia

Message:

Bug #410 -- changed the return value of psFitsReadHeaderSet to psMetadata*.

Location:

trunk/psLib

Files:

• src/dataIO/psFits.c (modified) (4 diffs)
• src/dataIO/psFits.h (modified) (3 diffs)
• src/fits/psFits.c (modified) (4 diffs)
• src/fits/psFits.h (modified) (3 diffs)
• test/dataIO/tst_psFits.c (modified) (6 diffs)

trunk/psLib/src/dataIO/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 21:07:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -571 +571 @@
 }
 
-psHash* psFitsReadHeaderSet(psHash* out,
-                            const psFits* fits)
+psMetadata* psFitsReadHeaderSet(psMetadata* out,
+                                const psFits* fits)
 {
     if (fits == NULL) {
@@ -582 +582 @@
 
     if (out == NULL) {
-        out = psHashAlloc(10);
-        // XXX: what is the appropriate number of buckets? Got 10 from psMetadataAlloc.
+        out = psMetadataAlloc();
         if (out == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    "Failed to allocate a new psHash container.");
+                    "Failed to allocate a new psMetadata container.");
             return NULL;
         }
@@ -607 +606 @@
         psMetadata* header = psFitsReadHeader(NULL, fits);
         if (name != NULL && header != NULL) {
-            psHashAdd(out, name, header);
+            psMetadataAddMetadata(out, PS_LIST_HEAD, name, "FITS Header",
+                                  header);
         } else { // XXX: is this a warning or error?
             psLogMsg(__func__, PS_LOG_WARN,

trunk/psLib/src/dataIO/psFits.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-24 23:52:25 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 21:07:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include "psVector.h"
 #include "psMetadata.h"
-#include "psHash.h"
 #include "psImage.h"
 
@@ -135 +134 @@
 /** Reads the header of all HDUs.  The current HDU is not changed.
  *
- *  @return psHash*      the header data
- */
-psHash* psFitsReadHeaderSet(
-    psHash* out,
-    ///< The psHash to add the header data via psMetadata items.  If null, a
-    ///< new psHash is created.  The keys of the psHash are the extension names
+ *  @return psMetadata*      the header data set as a number of metadata entries
+ */
+psMetadata* psFitsReadHeaderSet(
+    psMetadata* out,
+    ///< The psMetadata to add the header data via psMetadata items.  If null, a
+    ///< new psMetadata is created.  The keys of the psMetadata are the extension names
     ///< of the cooresponding HDUs.
 

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 21:07:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -571 +571 @@
 }
 
-psHash* psFitsReadHeaderSet(psHash* out,
-                            const psFits* fits)
+psMetadata* psFitsReadHeaderSet(psMetadata* out,
+                                const psFits* fits)
 {
     if (fits == NULL) {
@@ -582 +582 @@
 
     if (out == NULL) {
-        out = psHashAlloc(10);
-        // XXX: what is the appropriate number of buckets? Got 10 from psMetadataAlloc.
+        out = psMetadataAlloc();
         if (out == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    "Failed to allocate a new psHash container.");
+                    "Failed to allocate a new psMetadata container.");
             return NULL;
         }
@@ -607 +606 @@
         psMetadata* header = psFitsReadHeader(NULL, fits);
         if (name != NULL && header != NULL) {
-            psHashAdd(out, name, header);
+            psMetadataAddMetadata(out, PS_LIST_HEAD, name, "FITS Header",
+                                  header);
         } else { // XXX: is this a warning or error?
             psLogMsg(__func__, PS_LOG_WARN,

trunk/psLib/src/fits/psFits.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-24 23:52:25 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 21:07:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include "psVector.h"
 #include "psMetadata.h"
-#include "psHash.h"
 #include "psImage.h"
 
@@ -135 +134 @@
 /** Reads the header of all HDUs.  The current HDU is not changed.
  *
- *  @return psHash*      the header data
- */
-psHash* psFitsReadHeaderSet(
-    psHash* out,
-    ///< The psHash to add the header data via psMetadata items.  If null, a
-    ///< new psHash is created.  The keys of the psHash are the extension names
+ *  @return psMetadata*      the header data set as a number of metadata entries
+ */
+psMetadata* psFitsReadHeaderSet(
+    psMetadata* out,
+    ///< The psMetadata to add the header data via psMetadata items.  If null, a
+    ///< new psMetadata is created.  The keys of the psMetadata are the extension names
     ///< of the cooresponding HDUs.
 

trunk/psLib/test/dataIO/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-07 23:47:06 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 21:07:59 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -737 +737 @@
     psFitsMoveExtNum(fits,numHDUs/2, false);
 
-    psHash* headerSet = psFitsReadHeaderSet(NULL, fits);
+    psMetadata* headerSet = psFitsReadHeaderSet(NULL, fits);
 
     if (headerSet == NULL) {
@@ -759 +759 @@
         }
 
-        psMetadata* header = psHashLookup(headerSet, extname);
+        psMetadata* header = psMetadataLookupPtr(NULL,headerSet, extname);
 
         if (header == NULL) {
@@ -779 +779 @@
     }
 
-    psHash* set2 = psHashAlloc(20);
-
-    if (psFitsReadHeaderSet(set2,NULL) != NULL) {
+    psMetadata* set2 = psMetadataAlloc();
+    set2 = psFitsReadHeaderSet(set2,NULL);
+    if (set2 != NULL) {
         psError(PS_ERR_UNKNOWN, false,
                 "psFitsReadHeaderSet returned non-NULL given a NULL psFits.");
@@ -787 +787 @@
     }
 
-    psHash* set3 = psHashAlloc(20);
-    psFitsReadHeaderSet(set3,fits);
+    psMetadata* set3 = psMetadataAlloc();
+    set3 = psFitsReadHeaderSet(set3,fits);
 
     if (set3 == NULL) {
@@ -803 +803 @@
         }
 
-        psMetadata* header = psHashLookup(set3, extname);
+        psMetadata* header = psMetadataLookupPtr(NULL, set3, extname);
 
         if (header == NULL) {