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

Timestamp:

Nov 22, 2006, 2:53:31 PM (19 years ago)

Author:

cmv

Message:

mise en conformite xephem 3.7.2 cmv 22/11/2006

File:

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

trunk/SophyaExt/XephemAstroLib/formats.c

@@ -77 +77 @@
 }
 
-/* put the given modified Julian date, jd, in out[] according to preference
- * format.
+/* put the given modified Julian date, jd, in out[] according to the given
+ * preference format.
  * return number of characters written to out, not counting final '\0'.
  */
 int
-fs_date (char out[], double jd)
-{
-        int p = pref_get (PREF_DATE_FORMAT);
+fs_date (char out[], int format, double jd)
+{
         char *out0 = out;
         int m, y;
@@ -96 +95 @@
             mjd_cal (mjd_day(jd+0.5), &m, &d, &y);
 
-        switch (p) {
+        switch (format) {
         case PREF_YMD:
             out += sprintf (out, "%4d/%02d/%02.6g", y, m, d);
@@ -107 +106 @@
             break;
         default:
-            printf ("fs_date: bad date pref: %d\n", p);
+            printf ("fs_date: bad date pref: %d\n", format);
             abort();
         }
@@ -125 +124 @@
 double *dp)             /* cracked value, if return 0 */
 {
-        double a = 0, b = 0, c = 0;
-        char str[128];
+        double a, b, c;
+        char str[256];
         char *neg;
-        int r;
+        int isneg, r;
 
         /* copy str0 so we can play with it */
@@ -134 +133 @@
         str[sizeof(str)-1] = '\0';
 
+        /* note first negative (but not fooled by neg exponent) */
+        isneg = 0;
         neg = strchr(str, '-');
-        if (neg)
+        if (neg && (neg == str || (neg[-1] != 'E' && neg[-1] != 'e'))) {
             *neg = ' ';
+            isneg = 1;
+        }
+
+        /* crack up to three components */
+        a = b = c = 0.0;
         r = sscanf (str, "%lf%*[^0-9]%lf%*[^0-9]%lf", &a, &b, &c);
         if (r < 1)
             return (-1);
-        *dp = a + b/60 + c/3600;
-        if (neg)
+
+        /* back to one value, restoring neg */
+        *dp = (c/60.0 + b)/60.0 + a;
+        if (isneg)
             *dp *= -1;
         return (0);
@@ -202 +210 @@
 
 /* For RCS Only -- Do Not Edit */
-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 $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: formats.c,v $ $Date: 2006-11-22 13:53:29 $ $Revision: 1.6 $ $Name: not supported by cvs2svn $"};