ungleich-public/gmba_django
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Format + improve indexer

Browse source
This commit is contained in:
PCoder 2022-03-05 00:44:07 +05:30
parent 41a2129e9a
commit a0c3dd57dd
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/convert.py
View file

@ -147,7 +147,8 @@ def refresh_data(filename, fmt=None, update_existing=False):
elif fmt['dataformat'] is DataFormat.RESOURCE_DETAIL: elif fmt['dataformat'] is DataFormat.RESOURCE_DETAIL:
res, source_id = get_by_id(row['ID'], Resource) res, source_id = get_by_id(row['ID'], Resource)
if not res: res = Resource(source_id=source_id) if not res:
res = Resource(source_id=source_id)
res.title = row['Title'] res.title = row['Title']
res.citation = row['Citation'] res.citation = row['Citation']
res.url = fix_url(row['URL'].strip('#')) # remove weird #formatting# res.url = fix_url(row['URL'].strip('#')) # remove weird #formatting#
@ -166,9 +167,11 @@ def refresh_data(filename, fmt=None, update_existing=False):
elif fmt['dataformat'] is DataFormat.PERSON_RESOURCE: elif fmt['dataformat'] is DataFormat.PERSON_RESOURCE:
rzs, source_id = get_by_id(row['Resource'], Resource, first=False) rzs, source_id = get_by_id(row['Resource'], Resource, first=False)
if not rzs or not rzs.first(): continue if not rzs or not rzs.first():
continue
ppl, source_id = get_by_id(row['Person'], Person, first=False) ppl, source_id = get_by_id(row['Person'], Person, first=False)
if not ppl or not ppl.first(): continue if not ppl or not ppl.first():
continue
for person in ppl: for person in ppl:
person.resources = [] person.resources = []
for r in rzs: for r in rzs:

15
app/models.py
View file

@ -666,10 +666,17 @@ Involved scientist''')
return False return False
def index(self): def index(self):
self.field_indexer = " ".join([ if self:
self.first_name, self.last_name, self.organisation, self.position, self.biography self.field_indexer = " ".join([
]) self.first_name if self and self.first_name else "",
return True self.last_name if self and self.last_name else "",
self.organisation if self and self.organisation else "",
self.position if self and self.position else "",
self.biography if self and self.biography else ""
] if self else [])
return True
else:
return False
def fullname(self): def fullname(self):
return " ".join([self.title if self.title else '', return " ".join([self.title if self.title else '',