Changeset 7468

Timestamp:

Jun 9, 2006, 3:27:52 PM (20 years ago)

Author:

magnier

Message:

added support in ConfigParse for U8,U16,U32,S8,S16; replaced parseValue with parseDouble,parseSignedInt,parseUnsignedInt

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-09 02:35:17 $
+*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-10 01:27:52 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -218 +218 @@
 // Returns single parsed value as a double precision number. The input string must be cleaned and null
 // terminated.
-static double parseValue(char *inString,
-                         psS32 *status)
+static double parseDouble(char *inString,
+                          psS32 *status)
 {
     char *end = NULL;
@@ -225 +225 @@
 
     value = strtod(inString, &end);
+    if(*end != '\0') {
+        *status = 1;
+    } else if(inString==end) {
+        *status = 1;
+    }
+
+    return value;
+}
+
+// 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)
+{
+    char *end = NULL;
+    psS32 value = 0;
+
+    value = strtol(inString, &end, 0);
+    if(*end != '\0') {
+        *status = 1;
+    } else if(inString==end) {
+        *status = 1;
+    }
+
+    return value;
+}
+
+// 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)
+{
+    char *end = NULL;
+    psU32 value = 0;
+
+    value = strtoul(inString, &end, 0);
     if(*end != '\0') {
         *status = 1;
@@ -649 +685 @@
     psBool               tempBool      = false;
     psS32                tempInt       = 0;
+    psU32                tempUint       = 0;
     psVector*            tempVec       = NULL;
     char*                tempStr       = NULL;
@@ -706 +743 @@
         } else if(!strncmp(strType, "BOOL", 4)) {
             mdType = PS_DATA_BOOL;
+        } else if(!strncmp(strType, "S8", 2)) {
+            mdType = PS_DATA_S8;
+        } else if(!strncmp(strType, "S16", 3)) {
+            mdType = PS_DATA_S16;
         } else if(!strncmp(strType, "S32", 3)) {
             mdType = PS_DATA_S32;
+        } else if(!strncmp(strType, "U8", 2)) {
+            mdType = PS_DATA_U8;
+        } else if(!strncmp(strType, "U16", 3)) {
+            mdType = PS_DATA_U16;
+        } else if(!strncmp(strType, "U32", 3)) {
+            mdType = PS_DATA_U32;
         } else if(!strncmp(strType, "F32", 3)) {
             mdType = PS_DATA_F32;
@@ -817 +864 @@
     case PS_DATA_F32:
     case PS_DATA_F64:
-        tempDbl = parseValue(strValue, &status);
+        tempDbl = parseDouble(strValue, &status);
         if(!status) {
             addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName,
@@ -829 +876 @@
         }
         break;
+    case PS_DATA_S8:
+        tempInt = (psS8) parseSignedInt(strValue, &status);
+        if(!status) {
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempInt);
+        } else {
+            psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName,
+                    strType, lineCount, fileName);
+            returnValue = false;
+        }
+        break;
+    case PS_DATA_S16:
+        tempInt = (psS16) parseSignedInt(strValue, &status);
+        if(!status) {
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempInt);
+        } else {
+            psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName,
+                    strType, lineCount, fileName);
+            returnValue = false;
+        }
+        break;
     case PS_DATA_S32:
-        tempInt = (psS32)parseValue(strValue, &status);
+        tempInt = (psS32) parseSignedInt(strValue, &status);
         if(!status) {
-            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName,
-                                      mdType | flags,
-                                      strComment, tempInt);
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempInt);
+        } else {
+            psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName,
+                    strType, lineCount, fileName);
+            returnValue = false;
+        }
+        break;
+    case PS_DATA_U8:
+        tempUint = (psU8)parseUnsignedInt(strValue, &status);
+        if(!status) {
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempUint);
+        } else {
+            psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName,
+                    strType, lineCount, fileName);
+            returnValue = false;
+        }
+        break;
+    case PS_DATA_U16:
+        tempUint = (psU16)parseUnsignedInt(strValue, &status);
+        if(!status) {
+            addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempUint);
+        } else {
+            psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName,
+                    strType, lineCount, fileName);
+            returnValue = false;
+        }
+        break;
+    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, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName,