Changeset 9868 for trunk/psLib/src/types

Timestamp:

Nov 6, 2006, 12:31:31 PM (20 years ago)

Author:

drobbin

Message:

Added comment parsing for metadata in parseLine in psMetadataConfig.c. Added ok_strn to pstap.h. Updated # of planned tests in psArguments. Updated testing for psMetadataConfig.

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-04 03:15:43 $
+*  @version $Revision: 1.108 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-06 22:31:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -660 +660 @@
                                     break;
                                 }
-                 
+
                                 // Add item to metadata
                                 if(!psMetadataAddItem(md, mdItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
@@ -1169 +1169 @@
                     }
                 }
+
+                char *strValue = NULL;
+                strValue = getToken(&linePtr, "#", &status,true);
+                char *strComment = NULL;
+                strComment = getToken(&linePtr,"~", &status,true);
+
                 // Add metadata to upper level metadata
                 addStatus = psMetadataAdd(upperLevelInfo->metadata,
                                           PS_LIST_TAIL,lowerLevelInfo->name,
                                           PS_DATA_METADATA | flags,
-                                          "",
+                                          strComment, //"",
                                           lowerLevelInfo->metadata);
+                psFree(strValue);
+                psFree(strComment);
                 if(!addStatus) {
                     psFree(keyName);