Changeset 2818 in Sophya for trunk/SophyaExt/XephemAstroLib/formats.c

Timestamp:

Aug 21, 2005, 12:02:40 PM (20 years ago)

Author:

cmv

Message:

Update de Xephem 3.7 cmv 21/08/2005

File:

• trunk/SophyaExt/XephemAstroLib/formats.c (modified) (3 diffs)

trunk/SophyaExt/XephemAstroLib/formats.c

@@ -149 +149 @@
  *   PREF_DATE_FORMAT preference into its components. allow the day to be a
  *   floating point number,
- * actually the slashes may be anything but digits.
+ * the slashes may also be spaces or colons.
  * a lone component with a decimal point is considered a year.
  */
@@ -160 +160 @@
 int *y)
 {
-        double c[3]; /* the three components */
+        double X,Y,Z; /* the three components */
         int n;
 
-        memset (c, 0, sizeof(c));
-        n = sscanf (bp, "%lf%*[^0-9]%lf%*[^0-9]%lf", &c[0], &c[1], &c[2]);
+        X = Y = Z = 0.0;
+        n = sscanf (bp, "%lf%*[/: ]%lf%*[/: ]%lf", &X, &Y, &Z);
         if (n == 1 && (strchr(bp, '.')
-                        || (pref == PREF_MDY && (c[0] < 1 || c[0] > 12))
-                        || (pref == PREF_DMY && (c[0] < 1 || c[0] > 31)))) {
+                        || (pref == PREF_MDY && (X < 1 || X > 12))
+                        || (pref == PREF_DMY && (X < 1 || X > 31)))) {
             double Mjd;
-            year_mjd (c[0], &Mjd);
+            year_mjd (X, &Mjd);
             mjd_cal (Mjd, m, d, y);
         } else {
             switch (pref) {
             case PREF_MDY:
-                if (n > 0 && c[0] != 0)
-                    *m = (int)c[0];
-                if (n > 1 && c[1] != 0)
-                    *d = c[1];
-                if (n > 2 && c[2] != 0)
-                    *y = (int)c[2];
+                if (n > 0 && X != 0)
+                    *m = (int)X;
+                if (n > 1 && Y != 0)
+                    *d = Y;
+                if (n > 2 && Z != 0)
+                    *y = (int)Z;
                 break;
             case PREF_YMD:
-                if (n > 0 && c[0] != 0)
-                    *y = (int)c[0];
-                if (n > 1 && c[1] != 0)
-                    *m = (int)c[1];
-                if (n > 2 && c[2] != 0)
-                    *d = c[2];
+                if (n > 0 && X != 0)
+                    *y = (int)X;
+                if (n > 1 && Y != 0)
+                    *m = (int)Y;
+                if (n > 2 && Z != 0)
+                    *d = Z;
                 break;
             case PREF_DMY:
-                if (n > 1 && c[0] != 0)
-                    *d = c[0];
-                if (n > 2 && c[1] != 0)
-                    *m = (int)c[1];
-                if (n > 3 && c[2] != 0)
-                    *y = (int)c[2];
+                if (n > 0 && X != 0)
+                    *d = X;
+                if (n > 1 && Y != 0)
+                    *m = (int)Y;
+                if (n > 2 && Z != 0)
+                    *y = (int)Z;
                 break;
             }
@@ -202 +202 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: formats.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: formats.c,v $ $Date: 2005-08-21 10:02:37 $ $Revision: 1.5 $ $Name: not supported by cvs2svn $"};