Changeset 5136 for trunk/psLib/test/fits

Timestamp:

Sep 26, 2005, 11:13:36 AM (21 years ago)

Author:

desonia

Message:

changed PS_META* datatypes to more generic PS_DATA* datatypes.

File:

• trunk/psLib/test/fits/tst_psFits.c (modified) (4 diffs)

trunk/psLib/test/fits/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-27 01:33:41 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-26 21:13:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
-                      PS_META_S32,
+                      PS_DATA_S32,
                       "psS32 Item", (psS32)lcv);
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
-                      PS_META_F32,
+                      PS_DATA_F32,
                       "psF32 Item", (float)(1.0f/(float)(1+lcv)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
-                      PS_META_F64,
+                      PS_DATA_F64,
                       "psF64 Item", (double)(1.0/(double)(1+lcv)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
-                      PS_META_BOOL,
+                      PS_DATA_BOOL,
                       "psBool Item",
                       (lcv%2 == 0));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
-                      PS_META_STR,
+                      PS_DATA_STRING,
                       "String Item",
                       extname);
 
         psMetadataAdd(header,PS_LIST_TAIL, "EXTNAME",
-                      PS_META_STR,
+                      PS_DATA_STRING,
                       "Extension Name",
                       extname);
@@ -175 +175 @@
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
-                      PS_META_S32,
+                      PS_DATA_S32,
                       "psS32 Item",
                       (psS32)row);
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
-                      PS_META_F32,
+                      PS_DATA_F32,
                       "psF32 Item",
                       (float)(1.0f/(float)(1+row)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
-                      PS_META_F64,
+                      PS_DATA_F64,
                       "psF64 Item",
                       (double)(1.0/(double)(1+row)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
-                      PS_META_BOOL,
+                      PS_DATA_BOOL,
                       "psBool Item",
                       (row%2 == 0));
+
+        char* str = NULL;
+        psStringAppend(&str,"row=%d",row);
+        psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
+                      PS_DATA_STRING,
+                      "psString Item",
+                      str);
 
         table->data[row] = header;
@@ -685 +692 @@
 
         if (boolItem == NULL ||
-                boolItem->type != PS_META_BOOL) {
+                boolItem->type != PS_DATA_BOOL) {
             psError(PS_ERR_UNKNOWN, true,
                     "Failed to retrieve psBool metadata item from file.");