Changeset 5103

Timestamp:

Sep 22, 2005, 4:39:06 PM (21 years ago)

Author:

drobbin

Message:

updated psMetadataConfigFormat to correctly output comments

Location:

trunk/psLib

Files:

• src/types/psMetadataConfig.c (modified) (8 diffs)
• test/types/tst_psMetadata_07.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-15 21:22:22 $
+*  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-23 02:39:06 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1275 +1275 @@
             snprintf(content, MAXSTR, "%d ", item->data.S32);
             strncat(mdString, content, MAXSTR);
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
                 //                size = strlen(item->comment);
                 snprintf(content, MAXSTR, " #%s \n", item->comment);
@@ -1290 +1290 @@
             snprintf(content, MAXSTR, "%f ", item->data.F32);
             strncat(mdString, content, MAXSTR);
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
+                //            if ( item->comment != NULL ) {
                 //                size = strlen(item->comment);
                 snprintf(content, MAXSTR, " #%s \n", item->comment);
@@ -1305 +1306 @@
             snprintf(content, MAXSTR, "%f ", item->data.F64);
             strncat(mdString, content, MAXSTR);
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
+                //            if ( item->comment != NULL ) {
+                //            if ( !strncmp((char*)item->comment, "", 2) ) {
                 //                size = strlen(item->comment);
                 snprintf(content, MAXSTR, " #%s \n", item->comment);
@@ -1321 +1324 @@
             snprintf(content, MAXSTR, "%s ", ((char *)(item->data.V)));
             strncat(mdString, content, MAXSTR);
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
+                //            if ( item->comment != NULL ) {
                 //                size = strlen(item->comment);
                 snprintf(content, MAXSTR, " #%s \n", item->comment);
@@ -1342 +1346 @@
                 buffer2 = strtok(NULL, "\n");
             }
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
+                //            if ( item->comment != NULL ) {
                 snprintf(content, MAXSTR, "\nEND   #%s\n\n", item->comment);
                 strncat(mdString, content, MAXSTR);
@@ -1377 +1382 @@
             else
                 strncat(mdString, "F ", MAXSTR);
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
+                //            if ( item->comment != NULL ) {
                 snprintf(content, MAXSTR, " #%s \n", item->comment);
                 strncat(mdString, content, MAXSTR);
@@ -1431 +1437 @@
                 return NULL;
             }
-            if ( item->comment != NULL ) {
+            if ( strncmp(item->comment,"",2) ) {
+                //            if ( item->comment != NULL ) {
                 //                size = strlen(item->comment);
                 snprintf(content, MAXSTR, " #%s \n", item->comment);

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -12 +12 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-09-12 23:05:00 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-09-23 02:39:06 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
     time->leapsecond = true;
     psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true);
-    psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55);
-    psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14);
-    psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28);
+    psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "", 55);
+    psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, NULL, 3.14);
+    psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "", 6.28);
     psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS");
     psMetadataAddVector(md, PS_LIST_TAIL, "vector6", 0, "I am a vector", vec);
     psMetadataAddTime(md, PS_LIST_TAIL, "time01", 0, "I am time", time);
 
-    psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", 0, "I AM INT", 666);
+    psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", 0, NULL, 666);
     psMetadata *newestMD = NULL;
     newestMD = psMetadataAlloc();