Changeset 41070 for branches/ccl_branches/ipp-20190806/psModules/src/concepts/pmConceptsStandard.c

Timestamp:

Nov 7, 2019, 3:16:03 PM (7 years ago)

Author:

cclin33

Message:

sync from trunk through r40860

Location:

branches/ccl_branches/ipp-20190806

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/concepts/pmConceptsStandard.c (modified) (4 diffs)

branches/ccl_branches/ipp-20190806/psModules/src/concepts/pmConceptsStandard.c

@@ -931 +931 @@
 
     if (!item || item->type != PS_DATA_S32) {
-        psWarning("Unable to find %s --- assuming UTC", timesysName);
+        psWarning("Unable to find %s in format file --- assuming UTC", timesysName);
         return PS_TIME_UTC;
     }
@@ -982 +982 @@
     if (concept->type != PS_DATA_STRING || strlen(sys) <= 0) {
         // XXX is this too low verbosity?
-        psWarning("Can't interpret %s --- assuming UTC.", pattern->name);
+        psWarning("Can't interpret %s --- assuming UTC (other options: TAI, UT1, TT).", pattern->name);
     } else if (strcasecmp(sys, "TAI") == 0) {
         timeSys = PS_TIME_TAI;
@@ -993 +993 @@
     } else {
         // XXX is this too low verbosity?
-        psWarning("Can't interpret %s --- assuming UTC.", pattern->name);
+        psWarning("Can't interpret %s --- assuming UTC (other options: TAI, UT1, TT).", pattern->name);
     }
 
@@ -1464 +1464 @@
                                        const pmCell *cell)
 {
+    psAssert (concept->type == PS_DATA_TIME, "programming error: concept not supplied with psTime pointer\n");
     psTime *time = concept->data.V;     // The time