Changeset 5010

Timestamp:

Sep 12, 2005, 1:27:48 PM (21 years ago)

Author:

drobbin

Message:

set PS_META_META = PS_DATA_METADATA

Location:

trunk/psLib

Files:

• src/types/psMetadata.h (modified) (2 diffs)
• src/types/psMetadataConfig.c (modified) (2 diffs)
• src/xml/psXML.c (modified) (2 diffs)
• test/xml/tst_psXML.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-12 21:36:54 $
+*  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-12 23:27:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
     PS_META_UNKNOWN,                   ///< Other data (Stored as item.data.V).
     PS_META_MULTI,                     ///< Used internally, do not create an metadata item of this type.
-    PS_META_META,                      ///< Metadata data (Stored as item.data.md).
+    PS_META_META = PS_DATA_METADATA,   ///< Metadata data (Stored as item.data.md).
     PS_META_ARRAY,                     ///< Array data (Stored as item.data.V).
     PS_META_TIME                       ///< psTime data (Stored as item.data.V).

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-12 23:04:59 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-12 23:27:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1185 +1185 @@
         if ( type == 65538)
             type = PS_DATA_VECTOR;
-        if ( type == 65549)
+        if ( type == 65551)
             type = PS_DATA_TIME;
         if ( item->type == PS_META_META)

trunk/psLib/src/xml/psXML.c

@@ -10 +10 @@
 *  @author David Robbins, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-12 22:25:27 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-12 23:27:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
         if ( type == 65538)
             type = PS_DATA_VECTOR;
-        if ( type == 65547)
-            type = PS_DATA_METADATA;
-        if ( type == 65549)
+        //        if ( type == 65547)
+        //            type = PS_DATA_METADATA;
+        if ( type == 65551)
             type = PS_DATA_TIME;
         switch (type) {

trunk/psLib/test/xml/tst_psXML.c

@@ -15 +15 @@
 *  @author  Dave Robbins, MHPCC
 *
-*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-09-12 22:26:30 $
+*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-09-12 23:27:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -121 +121 @@
         printf("Key Type:  F64      Key Value: %15.3f  ", metadataItem->data.F64);
         break;
-    case PS_META_META:
+    case PS_DATA_METADATA:
         printf("Key Type:  METADATA    ");
         break;