Changeset 9874

Timestamp:

Nov 6, 2006, 7:09:32 PM (20 years ago)

Author:

drobbin

Message:

Added type handling for S/U64

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (6 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-07 04:35:21 $
+*  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-07 05:09:32 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -247 +247 @@
 // Returns single parsed value as a long signed int. The input string must be cleaned and null
 // terminated.
-static long int parseSignedInt(char *inString,
-                               psS32 *status)
+static psS64 parseSignedInt(char *inString,
+                            psS32 *status)
 {
     char *end = NULL;
-    psS32 value = 0;
+    psS64 value = 0;
 
     value = strtol(inString, &end, 0);
@@ -266 +266 @@
 // Returns single parsed value as a double precision number. The input string must be cleaned and null
 // terminated.
-static unsigned long int parseUnsignedInt(char *inString,
-        psS32 *status)
+static psU64 parseUnsignedInt(char *inString,
+                              psS32 *status)
 {
     char *end = NULL;
-    psU32 value = 0;
+    psU64 value = 0;
 
     value = strtoul(inString, &end, 0);
@@ -705 +705 @@
     psF64                tempDbl       = 0.0;
     psBool               tempBool      = false;
-    psS32                tempInt       = 0;
-    psU32                tempUint       = 0;
+    psS64                tempInt       = 0;
+    psU64                tempUint      = 0;
     psVector*            tempVec       = NULL;
     char*                tempStr       = NULL;
@@ -948 +948 @@
         }
         break;
+    case PS_DATA_S64:
+        tempInt = (psS64) parseSignedInt(strValue, &status);
+        if(!status) {
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags,
+                                      strComment, tempInt);
+        } else {
+            psError(PS_ERR_IO, true,
+                    _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u."),
+                    strValue, keyName, strType, lineCount);
+            returnValue = false;
+        }
+        break;
     case PS_DATA_U8:
         tempUint = (psU8)parseUnsignedInt(strValue, &status);
@@ -974 +986 @@
     case PS_DATA_U32:
         tempUint = (psU32)parseUnsignedInt(strValue, &status);
+        if(!status) {
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags,
+                                      strComment, tempUint);
+        } else {
+            psError(PS_ERR_IO, true,
+                    _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u."),
+                    strValue, keyName, strType, lineCount);
+            returnValue = false;
+        }
+        break;
+    case PS_DATA_U64:
+        tempUint = (psU64)parseUnsignedInt(strValue, &status);
         if(!status) {
             addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags,