Changeset 5000 for trunk/psLib/test/xml

Timestamp:

Sep 12, 2005, 11:36:54 AM (21 years ago)

Author:

drobbin

Message:

Added xml support for psTime data

Location:

trunk/psLib/test/xml

Files:

• psTime.xml (modified) (1 diff)
• tst_psXML.c (modified) (3 diffs)
• verified/tst_psXML.stdout (modified) (2 diffs)

trunk/psLib/test/xml/psTime.xml

@@ -12 +12 @@
     <item name = "psLib.time.BOOL.value3" psType = "BOOL" value = "t" />
     <item name = "psLib.time.BOOL.value4" psType = "BOOL" value = "F" />
+    <time name = "psLib.TIME.Magazine" psType = "PS_TIME_UTC" value = "1000, 25, F" />
     <vector name = "psLib.time.Vector.S32" psType = "S32" value = "-4, -2, 506"/>
     <vector name = "psLib.time.Vector.F32" psType = "F32" value = "-0.4944, -0.00023, 53262.0"/>

trunk/psLib/test/xml/tst_psXML.c

@@ -15 +15 @@
 *  @author  Dave Robbins, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-08-20 01:49:03 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-09-12 21:36:54 $
 *
 *  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_DATA_METADATA:
+    case PS_META_META:
         printf("Key Type:  METADATA    ");
         break;
@@ -138 +138 @@
         printf("%s", (char*)metadataItem->data.V );
         printf("\n");
+    } else if ( !strncmp(metadataItem->name, "psLib.TIME.Magazine", 256) ) {
+        printf("Key Value:   ");
+        printf("%ld, ", ((psTime*)(metadataItem->data.V))->sec );
+        printf("%u, ", ((psTime*)(metadataItem->data.V))->nsec );
+        if( ((psTime*)(metadataItem->data.V))->leapsecond )
+            printf("TRUE  ");
+        else
+            printf("FALSE  ");
+        if( ((psTime*)(metadataItem->data.V))->type == PS_TIME_UTC )
+            printf("PS_TIME_UTC ");
+        else if( ((psTime*)(metadataItem->data.V))->type == PS_TIME_TAI )
+            printf("PS_TIME_TAI ");
+        else if( ((psTime*)(metadataItem->data.V))->type == PS_TIME_UT1 )
+            printf("PS_TIME_UT1 ");
+        else if( ((psTime*)(metadataItem->data.V))->type == PS_TIME_TT )
+            printf("PS_TIME_TT ");
+        printf("\n");
     } else
         printf("Key Comment: %s\n", metadataItem->comment);

trunk/psLib/test/xml/verified/tst_psXML.stdout

@@ -7 +7 @@
  Key Name:    psLib.time.BOOL.value3  Key Type:  BOOL     Key Value:               1  Key Comment: 
  Key Name:    psLib.time.BOOL.value4  Key Type:  BOOL     Key Value:               0  Key Comment: 
+ Key Name:       psLib.TIME.Magazine  Key type:  psPtr    Key Value:   1000, 25, FALSE  PS_TIME_UTC 
  Key Name:     psLib.time.Vector.S32  Key type:  psPtr    Key Values:   -4  -2  506  
  Key Name:     psLib.time.Vector.F32  Key type:  psPtr    Key Comment: 
  Key Name:     psLib.time.Vector.F64  Key type:  psPtr    Key Comment: 
- Key Name:                      cell  Key type:  psPtr    Key Comment: 
+ Key Name:                      cell  Key Type:  METADATA    Key Comment: 
  Key Name:     psLib.time.tables.dir  Key type:  psPtr    Key Value:   ../../data
 
@@ -16 +17 @@
  Key Name:    psLib.time.BOOL.value4  Key Type:  BOOL     Key Value:               0  Key Comment: 
  Key Name:      psLib.time.F32.value  Key Type:  F32      Key Value:       50324.422  Key Comment: 
- Key Name:                      cell  Key type:  psPtr    Key Comment: 
+ Key Name:                      cell  Key Type:  METADATA    Key Comment: 
  Key Name:     psLib.time.Vector.F64  Key type:  psPtr    Key Comment: 
+ Key Name:       psLib.TIME.Magazine  Key type:  psPtr    Key Value:   1000, 25, FALSE  PS_TIME_UTC 
  Key Name:      psLib.time.F64.value  Key Type:  F64      Key Value:       80112.490  Key Comment: 
  Key Name:     psLib.time.Vector.S32  Key type:  psPtr    Key Values:   -4  -2  506