diff options
| author | goatchurch <goatchurch@ubuntu.clocksoft.dom> | 2009-09-11 23:56:47 +0100 |
|---|---|---|
| committer | goatchurch <goatchurch@ubuntu.clocksoft.dom> | 2009-09-11 23:56:47 +0100 |
| commit | ced45c92f7db673968069bf3ba506a4f2259d224 (patch) | |
| tree | bb9912e5f79175f50d60f8985281939c79394a25 /parsers/survex.py | |
| parent | f21cddb2d04bcdfbb8aa5e93501902460087dee0 (diff) | |
| download | troggle-ced45c92f7db673968069bf3ba506a4f2259d224.tar.gz troggle-ced45c92f7db673968069bf3ba506a4f2259d224.tar.bz2 troggle-ced45c92f7db673968069bf3ba506a4f2259d224.zip | |
tunnelfiles scheme added
Diffstat (limited to 'parsers/survex.py')
| -rw-r--r-- | parsers/survex.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 985d4e5..f8ec6d4 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -69,7 +69,6 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): mref = comment and re.match('.*?ref.*?(\d+)\s*#\s*(\d+)', comment) if mref: refscan = "%s#%s" % (mref.group(1), mref.group(2)) - print refscan survexscansfolders = models.SurvexScansFolder.objects.filter(walletname=refscan) if survexscansfolders: survexblock.survexscansfolder = survexscansfolders[0] @@ -125,7 +124,9 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): if expeditions: assert len(expeditions) == 1 survexblock.expedition = expeditions[0] - survexblock.expeditiondate = survexblock.expedition.get_expedition_day(survexblock.date) + survexblock.expeditionday = survexblock.expedition.get_expedition_day(survexblock.date) + survexblock.save() + elif re.match("team$(?i)", cmd): mteammember = re.match("(Insts|Notes|Tape|Dog|Useless|Pics|Helper|Disto|Consultant)\s+(.*)$(?i)", line) if mteammember: @@ -135,6 +136,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): if (personexpedition, tm) not in teammembers: teammembers.append((personexpedition, tm)) personrole = models.SurvexPersonRole(survexblock=survexblock, nrole=mteammember.group(1).lower(), personexpedition=personexpedition, personname=tm) + personrole.expeditionday = survexblock.expeditionday if personexpedition: personrole.person=personexpedition.person personrole.save() |