diff options
Diffstat (limited to 'parsers/surveys.py')
| -rw-r--r-- | parsers/surveys.py | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py index efab536..0eed6f0 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -1,12 +1,7 @@ import sys, os, types, logging, stat -#sys.path.append('C:\\Expo\\expoweb') -#from troggle import * -#os.environ['DJANGO_SETTINGS_MODULE']='troggle.settings' import settings from troggle.core.models import * from PIL import Image -#import settings -#import core.models as models import csv import re import datetime @@ -45,21 +40,18 @@ def readSurveysFromCSV(): logging.info("Deleting all scanned images") ScannedImage.objects.all().delete() - - + logging.info("Deleting all survey objects") Survey.objects.all().delete() - - + logging.info("Beginning to import surveys from "+str(os.path.join(settings.SURVEYS, "Surveys.csv"))+"\n"+"-"*60+"\n") - + for survey in surveyreader: - #I hate this, but some surveys have a letter eg 2000#34a. The next line deals with that. + # I hate this, but some surveys have a letter eg 2000#34a. The next line deals with that. walletNumberLetter = re.match(r'(?P<number>\d*)(?P<letter>[a-zA-Z]*)',survey[header['Survey Number']]) - # print(walletNumberLetter.groups()) + # print(walletNumberLetter.groups()) year=survey[header['Year']] - surveyobj = Survey( expedition = Expedition.objects.filter(year=year)[0], wallet_number = walletNumberLetter.group('number'), @@ -73,7 +65,6 @@ def readSurveysFromCSV(): pass surveyobj.save() - logging.info("added survey " + survey[header['Year']] + "#" + surveyobj.wallet_number + "\r") # dead @@ -141,7 +132,7 @@ def parseSurveyScans(expedition, logfile=None): yearPath=os.path.join(settings.SURVEY_SCANS, "surveyscans", expedition.year) print("No folder found for " + expedition.year + " at:- " + yearPath) -# dead + def parseSurveys(logfile=None): try: readSurveysFromCSV() @@ -271,8 +262,9 @@ def SetTunnelfileInfo(tunnelfile): fin.close() mtype = re.search("<(fontcolours|sketch)", ttext) - assert mtype, ff - tunnelfile.bfontcolours = (mtype.group(1)=="fontcolours") + #assert mtype, ff + if mtype: + tunnelfile.bfontcolours = (mtype.group(1)=="fontcolours") tunnelfile.npaths = len(re.findall("<skpath", ttext)) tunnelfile.save() |