diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-25 11:40:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-25 11:40:08 +0200 |
| commit | 014b7d2cd1ccdfca23a1f890bb1a16759bdf6aa4 (patch) | |
| tree | e0ca8ef7f434c5b6284ffbc28870ff36d9979c33 | |
| parent | 451143837acfb0d65ef0c2e7ac96fe6c6f0b329c (diff) | |
| download | Ishtar-014b7d2cd1ccdfca23a1f890bb1a16759bdf6aa4.tar.bz2 Ishtar-014b7d2cd1ccdfca23a1f890bb1a16759bdf6aa4.zip | |
data importer: multi regex management
| -rw-r--r-- | ishtar_common/data_importer.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index baf943068..974c63e44 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1262,8 +1262,13 @@ class Importer(object): unicode(self.ERRORS['regex_not_match']) + val)) c_row.append("") return - val_group = [v.replace(NEW_LINE_BREAK, '\n') if v else '' - for v in match.groups()] + val_group = [] + for g in formater.regexp.findall(val): + if isinstance(g, (tuple, list)): + g = u"".join(g) + val_group.append( + g.replace(NEW_LINE_BREAK, '\n') if g else '' + ) else: val_group = [val] |