Changeset 17024

Timestamp:

Mar 17, 2008, 1:54:43 PM (18 years ago)

Author:

eugene

Message:

use psTimeFromString for time-based arguments; report errors if encountered

File:

• trunk/psLib/src/types/psArguments.c (modified) (5 diffs)

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-17 21:33:48 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-03-17 23:54:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -182 +182 @@
     case PS_DATA_TIME:
     {
-        psTime *time = psTimeFromISO(argv[argnum], PS_TIME_UTC);
+        psTime *time = psTimeFromString(argv[argnum], PS_TIME_UTC);
         if (!time) {
             psError(PS_ERR_IO, true, "Unable to read argument value for %s", item->name);
@@ -240 +240 @@
                     psMetadataItem *param = NULL; // Parameter from iteration
                     while ((param = psMetadataGetAndIncrement(paramsIter))) {
-                        argumentRead(param, i, argc, argv);
+                        if (!argumentRead(param, i, argc, argv)) {
+                            psFree(paramsIter);
+                            psError(PS_ERR_IO, false, "error parsing argument %s\n", argItem->name);
+                            goto failed;
+                        }
                     }
                     psFree(paramsIter);
@@ -252 +256 @@
                     psMetadataItem *newItem = psMetadataItemCopy(template)
                                               ; // New item to add
-                    argumentRead(newItem, i, argc, argv);
+                    if (!argumentRead(newItem, i, argc, argv)) {
+                        psFree(newItem);
+                        psError(PS_ERR_IO, false, "error parsing argument %s\n", argItem->name);
+                        goto failed;
+                    }
+
                     psMetadataAddItem(arguments, newItem, PS_LIST_TAIL, PS_META_DUPLICATE_OK);
                     psFree(newItem);      // Drop reference
@@ -274 +283 @@
                     goto failed;
                 }
-                argumentRead(argItem, i, argc, argv);
+                if (!argumentRead(argItem, i, argc, argv)) {
+                    psError(PS_ERR_IO, false, "error parsing argument %s\n", argItem->name);
+                    goto failed;
+                }
                 break;
             }