xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

handling survex files not linked in completely

Browse Source
This commit is contained in:
Philip Sargent 2022-09-20 02:36:40 +03:00
parent 61f9863a06
commit 36995ec051
3 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/views/scans.py
View File

@ -35,6 +35,9 @@ add this file in to the todo list thinggy.
def populatewallet(w): def populatewallet(w):
'''Copy survex data here just for display, not permanently '''Copy survex data here just for display, not permanently
Only gets data from the survex file when it was parsed on import..
so doesn't work if there is no *ref value
''' '''
survexpeople = [] survexpeople = []
blocks = SurvexBlock.objects.filter(scanswallet = w) blocks = SurvexBlock.objects.filter(scanswallet = w)
@ -76,16 +79,15 @@ def caveifywallet(w):
w.displaynames = blocknames w.displaynames = blocknames
def fillblankpeople(w): def fillblankpeople(w):
# this isn't working..? why? # this isn't working..? why? Because it needs a *ref and an import
wp = w.people() wp = w.people()
if not wp: # an -empty list w.persons = wp
populatewallet(w) if len(wp) == 1:
else: # print(f' - {wp=}')
w.persons = wp nobody = wp[0].lower()
if len(wp) == 1: if nobody == 'unknown' or nobody == 'nobody' or nobody == ' ' or nobody == '':
nobody = wp[0].lower() print(f' - {wp=} {nobody=}')
if nobody == 'unknown' or nobody == 'nobody' or nobody == ' ' or nobody == '': populatewallet(w)
populatewallet(w)
def fillblankothers(w): def fillblankothers(w):
earliest = datetime.datetime.now().date() earliest = datetime.datetime.now().date()

71
core/views/uploads.py
View File

@ -142,7 +142,7 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl):
complaints.append("A date is mandatory. No data can be updated or edited unless you specify a date. Look in the survex file if there is one.") complaints.append("A date is mandatory. No data can be updated or edited unless you specify a date. Look in the survex file if there is one.")
# People # People
if waldata["people"]==["NOBODY"] or waldata["people"]==["Unknown"]: if not waldata["people"] or waldata["people"]==["NOBODY"] or waldata["people"]==["Unknown"] or waldata["people"]==[""]:
complaints.append("Someody must have done this. Look in the survex file, or in the logbook entries for this date, for the people who created this data.") complaints.append("Someody must have done this. Look in the survex file, or in the logbook entries for this date, for the people who created this data.")
# survex, but get_ticks has already done much of this ?? # survex, but get_ticks has already done much of this ??
@ -158,11 +158,20 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl):
sx = sx + ".svx" sx = sx + ".svx"
svxfiles.append(sx) svxfiles.append(sx)
if not (Path(settings.SURVEX_DATA) / sx).is_file(): if not (Path(settings.SURVEX_DATA) / sx).is_file():
file_complaint = f"{wallet} Incorrect survex file name in {wallet} wallet data. {sx} was not found in LOSER repo" file_complaint = f"{wallet} Incorrect survex file name. {sx} was not found in LOSER repo"
complaints.append(file_complaint) complaints.append(file_complaint)
message = f"! {file_complaint}" message = f"! {file_complaint}"
print(message) print(message)
DataIssue.objects.update_or_create(parser='scans', message=message, url=wurl) # set URL to this wallet folder DataIssue.objects.update_or_create(parser='scans', message=message, url=wurl) # set URL to this wallet folder
else:
try:
svxfile = SurvexFile.objects.get(path=sx)
except:
file_complaint = f"{wallet} Survex file name {sx} was not imported via a *include statement."
complaints.append(file_complaint)
message = f"! {file_complaint}"
print(message)
DataIssue.objects.update_or_create(parser='scans', message=message, url=wurl) # set URL to this wallet folder
if waldata["survex not required"] and waldata["survex file"] != "": if waldata["survex not required"] and waldata["survex file"] != "":
survex_complaint = "Survex is stated as not required and yet there is a survex file!" survex_complaint = "Survex is stated as not required and yet there is a survex file!"
@ -208,7 +217,7 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl):
if type(caveid) is list: if type(caveid) is list:
for i in caveid: for i in caveid:
i = i.replace("/","-") i = i.replace("/","-")
caveobject = getCave(i) # only th elast one gets recorded.. ouch. caveobject = getCave(i) # only the last one gets recorded.. ouch.
else: else:
caveid = caveid caveid = caveid
caveobject = getCave(caveid) caveobject = getCave(caveid)
@ -537,34 +546,36 @@ def scanupload(request, path=None):
#print(f' - {path=}') #print(f' - {path=}')
try: try:
svxfile = SurvexFile.objects.get(path=path) svxfile = SurvexFile.objects.get(path=path)
except:
message = f'Specified survex file not found - database apparently empty, you probably need to do a full re-import of all data.'
return render(request, 'errors/generic.html', {'message': message})
print(f' - {svxfile=}') print(f' - {svxfile=}')
if svxfile.cave: if svxfile.cave:
caves.append(svxfile.cave) caves.append(svxfile.cave)
caverefs.append(svxfile.cave.reference()) caverefs.append(svxfile.cave.reference())
blocks = SurvexBlock.objects.filter(survexfile= svxfile) blocks = SurvexBlock.objects.filter(survexfile= svxfile)
for b in blocks: for b in blocks:
print(f' - - {b=} {b.scanswallet=} {b.date=}') print(f' - - {b=} {b.scanswallet=} {b.date=}')
if b.scanswallet: if b.scanswallet:
refs.append(b.scanswallet) refs.append(b.scanswallet)
if b.scanswallet.walletname == wallet: if b.scanswallet.walletname == wallet:
if b.date: if b.date:
dates.append(b.date) dates.append(b.date)
if b.name != b.title: if b.name != b.title:
names.append(str(b.name) + "|" + str(b.title)) names.append(str(b.name) + "|" + str(b.title))
else: else:
names.append(str(b.name)) names.append(str(b.name))
# we can use the people, across all blocks that have this *ref # we can use the people, across all blocks that have this *ref
QSpeople = SurvexPersonRole.objects.filter(survexblock=b) QSpeople = SurvexPersonRole.objects.filter(survexblock=b)
print(f' - - {QSpeople=}') print(f' - - {QSpeople=}')
for p in QSpeople: for p in QSpeople:
print(f' - - {p.personname} ') print(f' - - {p.personname} ')
team.append(p.personname) team.append(p.personname)
# else: # else:
# print(f' - Wallet not matching *ref {b.scanswallet=} {wallet}') # print(f' - Wallet not matching *ref {b.scanswallet=} {wallet}')
except:
message = f'Specified survex file not found - database may be empty, or this survex file is not *included anywhere.'
# return render(request, 'errors/generic.html', {'message': message})
pass
if dates: if dates:
waldata["date"] = min(dates).isoformat() waldata["date"] = min(dates).isoformat()
print(f' - - {team=} ') print(f' - - {team=} ')

7
parsers/scans.py
View File

@ -21,10 +21,10 @@ from troggle.core.views.scans import datewallet
''' '''
contentsjson = "contents.json" contentsjson = "contents.json"
#indexhtml = "walletindex.html"
git = settings.GIT git = settings.GIT
# to do: create a 'low priority' field, so that any such wallet does not appear in summary reports # to do: Actually read all the JSON files and set the survex file field appropriately!
def CheckEmptyDate(wallet): def CheckEmptyDate(wallet):
@ -107,7 +107,7 @@ def load_all_scans():
for walletname, fpath, fisdir in GetListDir(fpath): for walletname, fpath, fisdir in GetListDir(fpath):
if fisdir: if fisdir:
wallet = Wallet(fpath=fpath, walletname=walletname) wallet = Wallet(fpath=fpath, walletname=walletname)
# this is where we should load the contents.json for people so we can report on them later # this is where we should load the contents.json for people, cave and date so we can report on them later
# this is where we should record the year explicitly # this is where we should record the year explicitly
# line 347 of view/uploads.py and needs refactoring for loading contentsjson # line 347 of view/uploads.py and needs refactoring for loading contentsjson
CheckEmptyDate(wallet) CheckEmptyDate(wallet)
@ -128,6 +128,7 @@ def load_all_scans():
if Path(walletpath, contentsjson).is_file(): if Path(walletpath, contentsjson).is_file():
walletname = walletpath.name walletname = walletpath.name
wallet, created = Wallet.objects.update_or_create(walletname=walletname) wallet, created = Wallet.objects.update_or_create(walletname=walletname)
# should now also load the json and use it ! check &ref is correct or missing too
if created: if created:
print(f"\n{walletname} created: only JSON, no actual uploaded scan files.", end=' ') print(f"\n{walletname} created: only JSON, no actual uploaded scan files.", end=' ')
CheckEmptyDate(wallet) CheckEmptyDate(wallet)