Changeset 2953

Timestamp:

06/20/06 23:01:00 (18 years ago)

Author:

jerome

Message:

Fixed date formatting problems with MySQL.

Location:

pykota/trunk

Files:

• cgi-bin/printquota.cgi (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (1 diff)
• pykota/storages/ldapstorage.py (modified) (2 diffs)

pykota/trunk/cgi-bin/printquota.cgi

@@ -241 +241 @@
                         else :    
                             billingcode_url = None
+                        curdate = DateTime.ISO.ParseDateTime(str(job.JobDate))
                         self.report.append('<tr class="%s">%s</tr>' % \
                                               (oddevenclass, \
                                                "".join(["<td>%s</td>" % (h or "&nbsp;") \
-                                                  for h in (str(job.JobDate[:19]), \
+                                                  for h in (str(curdate)[:19], \
                                                             _(job.JobAction), \
                                                             username_url, \
@@ -264 +265 @@
                                                             job.JobPages)])))
                     self.report.append('</table>')
-                    d = DateTime.ISO.ParseDateTime(str(job.JobDate))
                     dico = { "history" : 1,
-                             "datelimit" : "%04i%02i%02i %02i:%02i:%02i" % (d.year, d.month, d.day, d.hour, d.minute, d.second),
+                             "datelimit" : "%04i-%02i-%02i %02i:%02i:%02i" \
+                                                         % (curdate.year, \
+                                                            curdate.month, \
+                                                            curdate.day, \
+                                                            curdate.hour, \
+                                                            curdate.minute, \
+                                                            curdate.second),
                            }
                     if user and user.Exists :

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.25alpha7 (2006-06-20) :
+    
+        - Fixed some date formatting problems when retrieving the 
+          printing history with MySQL.
+          
+        - Began code cleaning.  
+          
     - 1.25alpha6 (2006-06-13) :
     

pykota/trunk/pykota/storage.py

@@ -745 +745 @@
         if start and end and (start > end) :
             (start, end) = (end, start)
+        try :    
+            if len(start) == 17 :
+                start = "%s-%s-%s %s" % (start[0:4], start[4:6], start[6:8], start[9:])
+        except TypeError :        
+            pass
+            
+        try :    
+            if len(end) == 17 :
+                end = "%s-%s-%s %s" % (end[0:4], end[4:6], end[6:8], end[9:])
+        except TypeError :        
+            pass
+            
         return (start, end)    
         

pykota/trunk/pykota/storages/ldapstorage.py

@@ -621 +621 @@
                 date = fields.get("createTimestamp", ["19700101000000Z"])[0] # It's in UTC !
                 mxtime = DateTime.strptime(date[:14], "%Y%m%d%H%M%S").localtime()
-                lastjob.JobDate = mxtime.strftime("%Y%m%d %H:%M:%S")
+                lastjob.JobDate = mxtime.strftime("%Y-%m-%d %H:%M:%S")
                 lastjob.Exists = True
         return lastjob
@@ -1376 +1376 @@
                 date = fields.get("createTimestamp", ["19700101000000Z"])[0] # It's in UTC !
                 mxtime = DateTime.strptime(date[:14], "%Y%m%d%H%M%S").localtime()
-                job.JobDate = mxtime.strftime("%Y%m%d %H:%M:%S")
+                job.JobDate = mxtime.strftime("%Y-%m-%d %H:%M:%S")
                 if ((start is None) and (end is None)) or \
                    ((start is None) and (job.JobDate <= end)) or \