Changeset 4891 for trunk/psLib/src/xml/psXML.c

Timestamp:

Aug 26, 2005, 3:33:41 PM (21 years ago)

Author:

drobbin

Message:

psMetadataAddWhatever fxns now accept an int format parameter (bug504)

File:

• trunk/psLib/src/xml/psXML.c (modified) (7 diffs)

trunk/psLib/src/xml/psXML.c

@@ -10 +10 @@
 *  @author David Robbins, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-19 00:31:42 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-27 01:33:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -347 +347 @@
                     strncpy(content,
                             (char*)cur_node->properties->next->next->children->content, MAXSTR);
-                    psMetadataAddS32(meta, PS_LIST_TAIL, name, "",
+                    psMetadataAddS32(meta, PS_LIST_TAIL, name, 0, "",
                                      (int)strtol(content, NULL, 10));
                     break;
@@ -354 +354 @@
                     strncpy(content,
                             (const char*)cur_node->properties->next->next->children->content, MAXSTR);
-                    psMetadataAddF32(meta, PS_LIST_TAIL, name, "", strtof(content, NULL));
+                    psMetadataAddF32(meta, PS_LIST_TAIL, name, 0, "", strtof(content, NULL));
                     break;
                 case PS_DATA_F64:
@@ -360 +360 @@
                     strncpy(content,
                             (const char*)cur_node->properties->next->next->children->content, MAXSTR);
-                    psMetadataAddF64(meta, PS_LIST_TAIL, name, "", strtod(content, NULL));
+                    psMetadataAddF64(meta, PS_LIST_TAIL, name, 0, "", strtod(content, NULL));
                     break;
                 case PS_DATA_STRING:
                     strncpy(name, (const char*)cur_node->properties->children->content, MAXSTR);
-                    psMetadataAddStr(meta, PS_LIST_TAIL, name, "",
+                    psMetadataAddStr(meta, PS_LIST_TAIL, name, 0, "",
                                      (const char*)cur_node->properties->next->next->children->content);
                     break;
@@ -382 +382 @@
                     psVector *vec = psVectorAlloc(strlen(content), elemType);
                     storeValues(vec, content, elemType);
-                    psMetadataAddVector(meta, PS_LIST_TAIL, name, "", vec);
+                    psMetadataAddVector(meta, PS_LIST_TAIL, name, 0, "", vec);
                     psFree(vec);
                     break;
@@ -390 +390 @@
                     psMetadata *temp = NULL;
                     temp = xml2metadata(cur_node->children, nodeNum);
-                    psMetadataAddMetadata(meta, PS_LIST_TAIL, name, "", temp);
+                    psMetadataAddMetadata(meta, PS_LIST_TAIL, name, 0, "", temp);
                     psFree(temp);
                     break;
@@ -401 +401 @@
                             !strncmp(content, "T", MAXSTR) ||
                             !strncmp(content, "t", MAXSTR) ) {
-                        psMetadataAddBool(meta, PS_LIST_TAIL, name, "", true);
+                        psMetadataAddBool(meta, PS_LIST_TAIL, name, 0, "", true);
                     } else if ( !strncmp(content, "false", MAXSTR) ||
                                 !strncmp(content, "FALSE", MAXSTR) ||
                                 !strncmp(content, "F", MAXSTR) ||
                                 !strncmp(content, "f", MAXSTR) ) {
-                        psMetadataAddBool(meta, PS_LIST_TAIL, name, "", false);
+                        psMetadataAddBool(meta, PS_LIST_TAIL, name, 0, "", false);
                     } else {
                         psError(PS_ERR_BAD_PARAMETER_VALUE, true,