Changeset 14030

Timestamp:

Jul 5, 2007, 4:07:57 PM (19 years ago)

Author:

magnier

Message:

output NULL for STR if entire string is blank

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -11 +11 @@
 *  @author Joshua Hoblitt, University of Hawaii 2006-2007
 *
-*  @version $Revision: 1.136 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-06-20 02:51:18 $
+*  @version $Revision: 1.137 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-07-06 02:07:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1546 +1546 @@
         FORMAT_PRIMITIVE_METADATAITEM(F64, ".15g");
         break;
-    case PS_DATA_STRING:
-        if (item->data.str && strlen(item->data.str) > 0) {
-            psStringAppend(&content, "%-15s  %-8s  %-15s",
-                           item->name, "STR", item->data.str);
-        } else {
-            psStringAppend(&content, "%-15s  %-8s  %-15s",
-                           item->name, "STR", "NULL");
-        }
-        if (item->comment && strncmp(item->comment,"",2)) {
-            psStringAppend(&content, "  # %s", item->comment);
-        }
-        psStringAppend(&content, " \n");
-        break;
+      case PS_DATA_STRING: {
+          bool valid = false;
+          if (item->data.str && strlen(item->data.str) > 0) {
+              char *p = item->data.str;
+              while (*p && isblank(*p)) p++;
+              if (*p) valid = true;
+          }
+          if (valid) {
+              psStringAppend(&content, "%-15s  %-8s  %-15s",
+                             item->name, "STR", item->data.str);
+          } else {
+              psStringAppend(&content, "%-15s  %-8s  %-15s",
+                             item->name, "STR", "NULL");
+          }
+          if (item->comment && strncmp(item->comment,"",2)) {
+              psStringAppend(&content, "  # %s", item->comment);
+          }
+          psStringAppend(&content, " \n");
+          break;
+      }
     case PS_DATA_METADATA: {
             if (item->comment && strncmp(item->comment,"",2)) {