Skip to content
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

Jump to bottom

Add parser TouristicEvent Apidae Parser + Refactor ApidaeParser #1816

Merged
merged 15 commits into from
Jan 8, 2019
Merged

Add parser TouristicEvent Apidae Parser + Refactor ApidaeParser #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b9f32e9
Fix Common parser
LePetitTim Dec 14, 2018
bed9ac6
Refactor parsers apidae, create touristiceventapidae
LePetitTim Dec 14, 2018
22da9b0
Add test eventapidaeparser
LePetitTim Dec 14, 2018
3e1a10a
Change name apidae data to apidaeContent
LePetitTim Dec 14, 2018
85afc63
Fix pep8
LePetitTim Dec 14, 2018
c26d5e5
Fix test EventApidaeParser
LePetitTim Dec 14, 2018
ccbed49
Remove useless size/skip in parsers
LePetitTim Dec 31, 2018
87cdce9
Add test count touristic event is equal to 0
LePetitTim Dec 31, 2018
8fb1a8a
Fix get to delete kwargs
LePetitTim Jan 8, 2019
29b36db
Update Changelog
LePetitTim Jan 8, 2019
03883cc
Change empty list to empty set
LePetitTim Jan 8, 2019
1c8e2fd
Change pass to return None for m2m constant fields
LePetitTim Jan 8, 2019
fcfd203
Change conditions empty dict is not the same as None
LePetitTim Jan 8, 2019
14fe20f
Remove useless natuarl_keys, m2m constant fields empty
LePetitTim Jan 8, 2019
39345a2
Deplace non fields in parser with attachmentparsermixin
LePetitTim Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ CHANGELOG

- Add italian translations that are visible on Geotrek-rando

**Minor changes**

- Create parser touristic event for apidae
- Refactor ApidaeParser


2.22.8 (2019-01-03)
-------------------
Expand Down
24 changes: 15 additions & 9 deletions geotrek/common/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,14 @@ def get_part(self, dst, src, val):
part, left = src.split('.', 1)
else:
part, left = src, ''
if part.isdigit():
return self.get_part(dst, left, val[int(part)])
elif part == '*':
return [self.get_part(dst, left, subval) for subval in val]
else:
return self.get_part(dst, left, val[part])
try:
value = int(part)
return self.get_part(dst, left, val[value])
except ValueError:
gutard marked this conversation as resolved.
Show resolved Hide resolved
if part == '*':
return [self.get_part(dst, left, subval) for subval in val]
else:
return self.get_part(dst, left, val[part])

def get_val(self, row, dst, src):
if hasattr(src, '__iter__'):
Expand Down Expand Up @@ -394,7 +396,7 @@ def get_to_delete_kwargs(self):
try:
kwargs[dst] = field.rel.to.objects.get(**{natural_key: val})
except field.rel.to.DoesNotExist:
raise GlobalImportError(_(u"{model} '{val}' does not exists in Geotrek-Admin. Please add it").format(model=field.rel.to._meta.verbose_name.title(), val=val))
return None
else:
kwargs[dst] = val
for dst, val in self.m2m_constant_fields.iteritems():
Expand All @@ -407,11 +409,15 @@ def get_to_delete_kwargs(self):
try:
kwargs[dst] = field.rel.to.objects.get(**filters)
except field.rel.to.DoesNotExist:
raise GlobalImportError(_(u"{model} '{val}' does not exists in Geotrek-Admin. Please add it").format(model=field.rel.to._meta.verbose_name.title(), val=val))
return None
return kwargs

def start(self):
self.to_delete = set(self.model.objects.filter(**self.get_to_delete_kwargs()).values_list('pk', flat=True))
kwargs = self.get_to_delete_kwargs()
if kwargs is None:
self.to_delete = set()
else:
self.to_delete = set(self.model.objects.filter(**kwargs).values_list('pk', flat=True))

def end(self):
if self.delete:
Expand Down