Correction d'un bog dans la representation digits des dates.

Alain Klotz
1 parent 5b835b38
Showing 1 changed file with 27 additions and 28 deletions Show diff stats
src/utils/celme/dates.py
@@ -498,39 +498,38 @@ class Date:
         .. note:: Prefer using objdate.date() followed by objdate.digits().            
         """
         error = 0
-        k1 = string.find("-",1)
-        k2 = string.find("-",k1+1)
-        kt = string.find("T",k2+1)
-        if (kt==-1):
-            kt = string.find("T",k2+1)
-        k3 = string.find(":",kt+1)
-        k4 = string.find(":",k3+1)
         d=1
         hh=0
         mm=0
         ss=0.0
-        if (k2 > -1): 
-            y = int(string[0:k1])
-            m = int(string[k1+1:k2])
-            if (kt == -1):
-                d = float(string[k2+1:])
-            else:
-                d = int(string[k2+1:kt])
-            if (k3 > -1):
-                hh = int(string[kt+1:k3])
-                d += hh/24.
-            if (k4 == -1):
-                mm = float(string[k3+1:])
-                d += mm/1440.
-            else:
-                mm = int(string[k3+1:k4])
-                d += mm/1440.
-                ss = float(string[k4+1:])
-                d += ss/86400.                
-            error, jd = self.date_ymd2jd(y,m,d)
+        if len(string)>=4: 
+            y = int(string[0:4])
         else:
-            # pb format
-            error = 1
+            y = int(string)
+        if len(string)>=6: 
+            m = int(string[4:6])
+        else:
+            m = 1
+        if len(string)>=8: 
+            d = int(string[6:8])
+        else:
+            d = 1
+        if len(string)>=10: 
+            hh = int(string[8:10])
+        else:
+            hh = 0
+        if len(string)>=12: 
+            mm = int(string[10:12])
+        else:
+            mm = 0
+        if len(string)>12:
+            ss = float(string[12:])
+        else:
+            ss = 0
+        d += hh/24.
+        d += mm/1440.
+        d += ss/86400.
+        error, jd = self.date_ymd2jd(y,m,d)
         return error, jd
  
     def date_jd2digits(self, jd, nb_subdigit=3):