Skip to content

Fixing parsing new norme #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing parsing new norme #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions cfonb/parser/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,11 @@ def parse(self, line):
if len(line) > self.size and len(line.strip()) <= self.size:
line = line[:self.size]
if len(line) != self.size:
raise ParsingError("Invalid line: >%s<. the len should be %s"
"instead of %s" % (line, self.size, len(line)))
if self._code == '05' and len(line) == 78:
line += ' ' * 42
else:
raise ParsingError("Invalid line: >%s<. the len should be %s"
"instead of %s" % (line, self.size, len(line)))
match = self.re.match(line)
# re check
if match is None:
Expand All @@ -125,15 +128,15 @@ class ParserContent01(Parser):
_regex = [
('record_code', '(01)', 2),
('bank_code', G_N, 5),
('_1', G__, 4),
('_1', G_AN_, 4),
('desk_code', G_N, 5),
('currency_code', G_A_, 3),
('nb_of_dec', G_N_, 1),
('_2', G__, 1),
('account_nb', G_AN, 11),
('_3', G__, 2),
('prev_date', G_N, 6),
('_4', G__, 50),
('_4', G_ALL, 50),
('prev_amount', G_AMT, 14),
('_5', G_ALL, 16),
]
Expand Down Expand Up @@ -194,7 +197,7 @@ class ParserContent05(Parser):
('account_nb', G_AN, 11),
('operation_code', G_AN, 2),
('operation_date', G_N, 6),
('_2', G__, 5),
('_2', G_N_, 5),
('qualifier', G_AN, 3),
('additional_info', G_ALL, 70),
('_3', G__, 2),
Expand All @@ -212,17 +215,17 @@ class ParserContent07(Parser):
_regex = [
('record_code', '(07)', 2),
('bank_code', G_N, 5),
('_1', G__, 4),
('_1', G_AN_, 4),
('desk_code', G_N, 5),
('currency_code', G_A_, 3),
('nb_of_dec', G_N_, 1),
('_2', G__, 1),
('account_nb', G_AN, 11),
('_3', G__, 2),
('next_date', G_N, 6),
('_4', G__, 50),
('_4', G_ALL, 50),
('next_amount', G_AMT, 14),
('_5', G__, 16),
('_5', G_ALL, 16),
]

def _post(self, res):
Expand Down Expand Up @@ -354,7 +357,7 @@ def _post(self, res):
res = super(ParserMMO, self)._post(res)
res['equivalent_amount'] = float(res['equivalent_amount'])\
/float(res['nb_of_dec_amount'])
if res['exchange_rate']:
if res['exchange_rate'] and float(res['nb_of_dec_exchange_rate']) > 0:
res['exchange_rate']= float(res['exchange_rate'])\
/float(res['nb_of_dec_exchange_rate'])
return res
Expand Down
2 changes: 1 addition & 1 deletion cfonb/parser/statement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def parse(self, file_obj):
# content
result = {}
for index, line in enumerate(file_lines):

#print(f"at line number {index+1}")
if line[0:2] == '01':
row = Row(line)

Expand Down