expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-10 23:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r8163] More work on survey images parser and virtual survey binder. Renamed expedition_year field of Survey model to expedition because this makes more sense.

Browse Source
This commit is contained in:
aaron
2009-01-16 20:50:23 +01:00
parent 246bb42545
commit 014f390100
5 changed files with 147 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
troggle/parsers/surveys.py
View File

@@ -31,7 +31,7 @@ for survey in surveyreader:
# print walletNumberLetter.groups()
surveyobj = models.Survey(
expedition_year = models.Expedition.objects.filter(year=survey[header['Year']])[0],
expedition = models.Expedition.objects.filter(year=survey[header['Year']])[0],
wallet_number = walletNumberLetter.group('number'),
comments = survey[header['Comments']],
@@ -58,20 +58,23 @@ def parseSurveyScans(year):
for scan in scanList:
try:
scanChopped=re.match(r'([a-zA-Z]*)(\d*)\.(png|jpg|JPG|PNG)',scan).groups()
scanChopped=re.match(r'(?i).*(notes|elev|plan|elevation|extend)(\d*)\.(png|jpg|jpeg)',scan).groups()
scanType,scanNumber,scanFormat=scanChopped
except AttributeError:
print scan + " ignored"
print "Adding scans: " + scan + " ignored"
continue
if scanType == 'elev' or scanType == 'extend':
scanType = 'elevation'
if scanNumber=='':
scanNumber=1
if type(surveyNumber)==types.TupleType:
surveyNumber=surveyNumber[0]
try:
survey=models.Survey.objects.get_or_create(wallet_number=surveyNumber, expedition_year=year)[0]
survey=models.Survey.objects.get_or_create(wallet_number=surveyNumber, expedition=year)[0]
except models.Survey.MultipleObjectsReturned:
survey=models.Survey.objects.filter(wallet_number=surveyNumber, expedition_year=year)[0]
survey=models.Survey.objects.filter(wallet_number=surveyNumber, expedition=year)[0]
scanObj = models.ScannedImage(
file=os.path.join(year.year, surveyFolder, scan),
@@ -79,7 +82,7 @@ def parseSurveyScans(year):
number_in_wallet=scanNumber,
survey=survey
)
print "Added scanned image at " + str(scanObj)
#print "Added scanned image at " + str(scanObj)
scanObj.save()
for year in models.Expedition.objects.filter(year__gte=2000): #expos since 2000, because paths and filenames were nonstandard before then