diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/drawings.py | 4 | ||||
| -rw-r--r-- | parsers/survex.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/parsers/drawings.py b/parsers/drawings.py index f3aca47..8c45aae 100644 --- a/parsers/drawings.py +++ b/parsers/drawings.py @@ -34,7 +34,7 @@ def get_or_create_placeholder(year): placeholder_logbook_entry, newly_created = save_carefully(LogbookEntry, lookupAttribs, nonLookupAttribs) return placeholder_logbook_entry -def find_tunnel_file(dwgfile, path): +def find_dwg_file(dwgfile, path): '''Is given a line of text 'path' which may or may not contain a recognisable name of a scanned file which we have already seen when we imported all the files we could find in the surveyscans direstories ''' @@ -164,7 +164,7 @@ def setdwgfileinfo(dwgfile): # <pcarea area_signal="frame" sfscaledown="12.282584" sfrotatedeg="-90.76982" sfxtrans="11.676667377221136" sfytrans="-15.677173422877454" sfsketch="204description/scans/plan(38).png" sfstyle="" nodeconnzsetrelative="0.0"> for path, style in rx_pcpath.findall(ttext): - find_tunnel_file(dwgfile, path.decode()) + find_dwg_file(dwgfile, path.decode()) # should also scan and look for survex blocks that might have been included, and image scans # which would populate dwgfile.survexfile diff --git a/parsers/survex.py b/parsers/survex.py index f329ace..569d091 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -207,7 +207,6 @@ class LoadingSurvex(): if (personexpedition, tm) not in teammembers: teammembers.append((personexpedition, tm)) personrole = SurvexPersonRole(survexblock=survexblock, personexpedition=personexpedition, personname=tm) -# personrole = SurvexPersonRole(survexblock=survexblock, nrole=mteammember.group(1).lower(), personexpedition=personexpedition, personname=tm) personrole.save() personrole.expeditionday = survexblock.expeditionday if personexpedition: |