Changeset 3099 for WAeUP_SRP

Timestamp:

4 Feb 2008, 10:12:41 (17 years ago)

Author:

joachim

Message:

use correct condition

File:

• WAeUP_SRP/base/PatchExtendedWidgetsCPSDateTimeWidget.py (modified) (2 diffs)

WAeUP_SRP/base/PatchExtendedWidgetsCPSDateTimeWidget.py

@@ -31 +31 @@
             datamodel[field_id] = None
             return 1
-    # import pdb;pdb.set_trace()
+    #import pdb;pdb.set_trace()
     if self.view_format.startswith('iso8601'):
         if re.match(r'^[0-9]+-[0-9]{2}-[0-9]{2}', date) is not None:
@@ -39 +39 @@
             return 0
     else:
-        if re.match(r'^[0-9]?[0-9]/[0-9]?[0-9]/[0-9]{2,4}$', date) is not None:
+        if re.match(r'^[0-9]?[0-9][/,\-,\.][0-9]?[0-9][/,\-,\.][0-9]{2,4}$', date) is not None:
             d, m, y = re.split(r'[/,\-,\.]',date) # always use d/m/y and use /,- or . as separator
             #d, m, y = date.split('/') # always use d/m/y