Index: /trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.c	(revision 9933)
+++ /trunk/psLib/src/types/psMetadataConfig.c	(revision 9934)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.119 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-09 21:41:15 $
+*  @version $Revision: 1.120 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-09 23:37:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -151,11 +151,9 @@
             ptrB++;
         }
-    }
-    /*    else {
-            while (isspace(*ptrB)) {
-                ptrB++;
-            }
-        }
-    */
+    } else {
+        while (isspace(*ptrB)) {
+            ptrB++;
+        }
+    }
 
     // Skip over trailing whitespace, null terminators, and # characters
@@ -230,9 +228,8 @@
         // Move to end of token
         (*inString) += sLen;
-    }
-    /*    else if(**inString!='\0' && sLen==0) {
-            *status = 1;
-        }
-    */
+    } else if(**inString!='\0' && sLen==0) {
+        *status = 1;
+    }
+
     return cleanToken;
 }
@@ -249,9 +246,8 @@
     if(*end != '\0') {
         *status = 1;
-    }
-    /*    else if(inString==end) {
-            *status = 1;
-        }
-    */
+    } else if(inString==end) {
+        *status = 1;
+    }
+
     return value;
 }
@@ -268,9 +264,8 @@
     if(*end != '\0') {
         *status = 1;
-    }
-    /*    else if(inString==end) {
-            *status = 1;
-        }
-    */
+    } else if(inString==end) {
+        *status = 1;
+    }
+
     return value;
 }
@@ -287,9 +282,8 @@
     if(*end != '\0') {
         *status = 1;
-    }
-    /*    else if(inString==end) {
-            *status = 1;
-        }
-    */
+    } else if(inString==end) {
+        *status = 1;
+    }
+
     return value;
 }
@@ -300,11 +294,11 @@
 {
     // if inString is NULL return flalse, status = 0
-    /*    if (!inString) {
-            if (status) {
-                *status = 0;
-            }
-            return false;
-        }
-    */
+    if (!inString) {
+        if (status) {
+            *status = 0;
+        }
+        return false;
+    }
+
     if (!strncasecmp(inString, "T", 2) ||
             !strncmp(inString, "1", 2) ||
@@ -336,9 +330,9 @@
 {
     PS_ASSERT_PTR_NON_NULL(status, NULL);
-    /*    if (!inString) {
-            *status = 0;
-            return NULL;
-        }
-    */
+    if (!inString) {
+        *status = 0;
+        return NULL;
+    }
+
     // handle "NULL" as the time value
     if (strncmp(inString, "NULL", 5) == 0) {
@@ -583,20 +577,20 @@
         tempItem = psMetadataItemAllocStr(token,"","");
         psMetadataAddItem(metadataTemplate, tempItem, PS_LIST_TAIL, PS_META_DEFAULT);
-        /*        if(tempItem == NULL) {
-                    psFree(metadataTemplate);
-                    psFree(token);
-                    metadataTemplate = NULL;
-                    break;
-                }
-
-                // Add item to template
-                if(!psMetadataAddItem(metadataTemplate, tempItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
-                    psFree(metadataTemplate);
-                    psFree(tempItem);
-                    psFree(token);
-                    metadataTemplate = NULL;
-                    break;
-                }
-        */
+        if(tempItem == NULL) {
+            psFree(metadataTemplate);
+            psFree(token);
+            metadataTemplate = NULL;
+            break;
+        }
+
+        // Add item to template
+        if(!psMetadataAddItem(metadataTemplate, tempItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
+            psFree(metadataTemplate);
+            psFree(tempItem);
+            psFree(token);
+            metadataTemplate = NULL;
+            break;
+        }
+
         psFree(tempItem);
         psFree(token);
@@ -633,11 +627,10 @@
             templateItem = psListGetAndIncrement(iter)
                            ;
-            /*            if(templateItem == NULL) {
-                            psFree(md);
-                            psFree(iter);
-                            md = NULL;
-                            break;
-                        }
-            */
+            if(templateItem == NULL) {
+                psFree(md);
+                psFree(iter);
+                md = NULL;
+                break;
+            }
             // Get the next token on the line
             token = getToken(&linePtr, " ", &status, false);
@@ -646,22 +639,22 @@
                 mdItem = psMetadataItemAllocStr(templateItem->name,
                                                 templateItem->comment, token);
-                /*                if(mdItem == NULL) {
-                                    psFree(md);
-                                    md = NULL;
-                                    psFree(token);
-                                    psFree(iter);
-                                    break;
-                                }
-
-                                // Add item to metadata
-                                if(!psMetadataAddItem(md, mdItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
-                                    psFree(md);
-                                    md = NULL;
-                                    psFree(mdItem);
-                                    psFree(token);
-                                    psFree(iter);
-                                    break;
-                                }
-                */
+                if(mdItem == NULL) {
+                    psFree(md);
+                    md = NULL;
+                    psFree(token);
+                    psFree(iter);
+                    break;
+                }
+
+                // Add item to metadata
+                if(!psMetadataAddItem(md, mdItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
+                    psFree(md);
+                    md = NULL;
+                    psFree(mdItem);
+                    psFree(token);
+                    psFree(iter);
+                    break;
+                }
+
                 psMetadataAddItem(md, mdItem, PS_LIST_TAIL, PS_META_DEFAULT);
                 psFree(mdItem);
@@ -839,13 +832,13 @@
         status = 0;
         strValue = getToken(&linePtr, "#", &status,true);
-        /*
-                if(status) {
-                    psError(PS_ERR_IO, true,
-                            _("Failed to read a metadata %s on line %u."), "value", lineCount);
-                    psFree(strType);
-                    psFree(strValue);
-                    return false;
-                }
-        */
+
+        if(status) {
+            psError(PS_ERR_IO, true,
+                    _("Failed to read a metadata %s on line %u."), "value", lineCount);
+            psFree(strType);
+            psFree(strValue);
+            return false;
+        }
+
         if(strValue==NULL) {
             psError(PS_ERR_IO, true,
@@ -858,13 +851,11 @@
         status = 0;
         strComment = getToken(&linePtr,"~", &status,true);
-        /*
-                if(status) {
-                    psError(PS_ERR_IO, true,
-                            _("Failed to read a metadata %s on line %u."), "comment", lineCount);
-                    psFree(strType);
-                    psFree(strValue);
-                    psFree(strComment);
-                }
-        */
+        if(status) {
+            psError(PS_ERR_IO, true,
+                    _("Failed to read a metadata %s on line %u."), "comment", lineCount);
+            psFree(strType);
+            psFree(strValue);
+            psFree(strComment);
+        }
     }