Changeset 1272

Timestamp:

Jul 22, 2004, 11:24:54 AM (22 years ago)

Author:

harman

Message:

Changed if statement

Location:

trunk/psLib/src

Files:

• astro/psTime.c (modified) (3 diffs)
• astronomy/psTime.c (modified) (3 diffs)

trunk/psLib/src/astro/psTime.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 21:01:43 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 21:24:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -283 +283 @@
     month = atoi(strtok(NULL, "/"));
     if(month<1 || month>12) {
-        psError(__func__,"Month must have a value from 0 to 11. Value: %d", month);
+        psError(__func__,"Month must have a value from 1 to 12. Value: %d", month);
         return outTime;
     }
@@ -435 +435 @@
     } else if(time->tm_year < 70)
     {
-        psError(__func__,"Input times earlier than 1970 not allowed");
+        psError(__func__,"Input times earlier than 1970 not allowed. Value: %d", time->tm_year+1900);
+        return outTime;
+    } else  if(time->tm_mon<0 || time->tm_mon>11)
+    {
+        psError(__func__,"Month must have a value from 0 to 11. Value: %d", time->tm_mon);
+        return outTime;
+    } else if(time->tm_mday<1 || time->tm_mday>31)
+    {
+        psError(__func__,"Day must have a value from 1 to 31. Value: %d", time->tm_mday);
+        return outTime;
+    } else if(time->tm_hour<0 || time->tm_hour>23)
+    {
+        psError(__func__,"Hour must have a value from 0 to 23. Value: %d", time->tm_hour);
+        return outTime;
+    } else if(time->tm_min<0 || time->tm_min>59)
+    {
+        psError(__func__,"Minute must have a value from 0 to 59. Value: %d", time->tm_min);
+        return outTime;
+    } else if(time->tm_sec<0 || time->tm_sec>59)
+    {
+        psError(__func__,"Second must have a value from 0 to 59. Value: %d", time->tm_sec);
         return outTime;
     }

trunk/psLib/src/astronomy/psTime.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 21:01:43 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 21:24:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -283 +283 @@
     month = atoi(strtok(NULL, "/"));
     if(month<1 || month>12) {
-        psError(__func__,"Month must have a value from 0 to 11. Value: %d", month);
+        psError(__func__,"Month must have a value from 1 to 12. Value: %d", month);
         return outTime;
     }
@@ -435 +435 @@
     } else if(time->tm_year < 70)
     {
-        psError(__func__,"Input times earlier than 1970 not allowed");
+        psError(__func__,"Input times earlier than 1970 not allowed. Value: %d", time->tm_year+1900);
+        return outTime;
+    } else  if(time->tm_mon<0 || time->tm_mon>11)
+    {
+        psError(__func__,"Month must have a value from 0 to 11. Value: %d", time->tm_mon);
+        return outTime;
+    } else if(time->tm_mday<1 || time->tm_mday>31)
+    {
+        psError(__func__,"Day must have a value from 1 to 31. Value: %d", time->tm_mday);
+        return outTime;
+    } else if(time->tm_hour<0 || time->tm_hour>23)
+    {
+        psError(__func__,"Hour must have a value from 0 to 23. Value: %d", time->tm_hour);
+        return outTime;
+    } else if(time->tm_min<0 || time->tm_min>59)
+    {
+        psError(__func__,"Minute must have a value from 0 to 59. Value: %d", time->tm_min);
+        return outTime;
+    } else if(time->tm_sec<0 || time->tm_sec>59)
+    {
+        psError(__func__,"Second must have a value from 0 to 59. Value: %d", time->tm_sec);
         return outTime;
     }