From 8d23160f6163e858b6a946cf8d0b29d929f09444 Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@symlink.me>
Date: Wed, 1 Aug 2012 12:45:52 +0200
Subject: [PATCH] support card and withdrawal transactions

---
 modules/caissedepargne/pages.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/caissedepargne/pages.py b/modules/caissedepargne/pages.py
index 2d58e000..f45eed9d 100644
--- a/modules/caissedepargne/pages.py
+++ b/modules/caissedepargne/pages.py
@@ -55,12 +55,10 @@ class LoginPage(BasePage):
         self.browser.submit(nologin=True)
 
 class Transaction(FrenchTransaction):
-    PATTERNS = [(re.compile('^RET DAB (?P<text>.*?) RETRAIT DU (?P<dd>\d{2})(?P<mm>\d{2})(?P<yy>\d{2}).*'),
-                                                            FrenchTransaction.TYPE_WITHDRAWAL),
-                (re.compile('^RET DAB (?P<text>.*?) CARTE ?:.*'),
-                                                            FrenchTransaction.TYPE_WITHDRAWAL),
-                (re.compile('(\w+) (?P<dd>\d{2})(?P<mm>\d{2})(?P<yy>\d{2}) CB:[^ ]+ (?P<text>.*)'),
+    PATTERNS = [(re.compile('^CB (?P<text>.*?) FACT (?P<dd>\d{2})(?P<mm>\d{2})(?P<yy>\d{2})'),
                                                             FrenchTransaction.TYPE_CARD),
+                (re.compile('^RETRAIT DAB (?P<dd>\d+)-(?P<mm>\d+)-.*'),
+                                                            FranchTransaction.TYPE_WITHDRAWAL),
                 (re.compile('^VIR(EMENT)? (?P<text>.*)'),   FrenchTransaction.TYPE_TRANSFER),
                 (re.compile('^PRLV (?P<text>.*)'),          FrenchTransaction.TYPE_ORDER),
                 (re.compile('^CHEQUE.*'),                   FrenchTransaction.TYPE_CHECK),
@@ -123,7 +121,7 @@ class IndexPage(BasePage):
             debit = u''.join([txt.strip() for txt in tds[-2].itertext()])
             credit = u''.join([txt.strip() for txt in tds[-1].itertext()])
 
-            t.parse(date, raw)
+            t.parse(date, re.sub(r'[ ]+', ' ', raw))
             t.set_amount(credit, debit)
             yield t