Changeset 19668

Timestamp:

Sep 23, 2008, 9:22:09 AM (18 years ago)

Author:

Paul Price

Message:

Print unsupported types too.

File:

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

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.171 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-07-24 22:42:28 $
+ *  @version $Revision: 1.172 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-09-23 19:22:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1376 +1376 @@
     psMetadataItem *item = NULL; // Item from metadata
     while ( (item = psMetadataGetAndIncrement(iter)) ) {
-        //So that unsupported types are not printed here, adding a switch statement
-        switch(item->type) {
-        case PS_DATA_STRING:
-        case PS_DATA_BOOL:
-        case PS_DATA_S8:
-        case PS_DATA_S16:
-        case PS_DATA_S32:
-        case PS_DATA_S64:
-        case PS_DATA_U8:
-        case PS_DATA_U16:
-        case PS_DATA_U32:
-        case PS_DATA_U64:
-        case PS_DATA_F32:
-        case PS_DATA_F64:
-        case PS_DATA_METADATA:
-        case PS_DATA_REGION:
-        case PS_DATA_LIST:
-        case PS_DATA_TIME:
-        case PS_DATA_VECTOR:
-            // Indent...
-            //                fprintf(fd, "\n");
-            for (int i = 0; i < level; i++) {
-                fprintf(fd, "  ");
-            }
-            fprintf(fd, "%s", item->name);
-            if (item->comment && strlen(item->comment) > 0) {
-                fprintf(fd, " (%s)", item->comment);
-            }
-            fprintf(fd, ": ");
-            break;
-        case PS_DATA_UNKNOWN:
-        default:
-            break;
-        }
+        for (int i = 0; i < level; i++) {
+            fprintf(fd, "  ");
+        }
+        fprintf(fd, "%s", item->name);
+        if (item->comment && strlen(item->comment) > 0) {
+            fprintf(fd, " (%s)", item->comment);
+        }
+        fprintf(fd, ": ");
+
         switch (item->type) {
         case PS_DATA_STRING:
@@ -1566 +1541 @@
             case PS_DATA_UNKNOWN:
             default:
-              psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                      _("Specified psDataType, %d, is not supported."), vector->type.type);
-              psFree(iter);
               fprintf(fd, "<Unsupported type>\n");
-              return false;
           }
           break;