diff --git a/parsers/survex.py b/parsers/survex.py index 1450255..035c21e 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -231,6 +231,9 @@ def ReloadSurvexCave(survex_cave): def LoadAllSurvexBlocks(): + + print 'Loading All Survex Blocks...' + models.SurvexBlock.objects.all().delete() models.SurvexFile.objects.all().delete() models.SurvexDirectory.objects.all().delete() @@ -265,6 +268,9 @@ def LoadAllSurvexBlocks(): poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$") def LoadPos(): + + print 'Loading Pos....' + call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA]) call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA) posfile = open("%sall.pos" % settings.SURVEX_DATA) diff --git a/parsers/surveys.py b/parsers/surveys.py index 0ce86a0..07e8cc2 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -190,8 +190,8 @@ def LoadListScansFile(survexscansfolder): # and builds up the models we can access later def LoadListScans(): - print '\tLoading Survey Scans...' - + print 'Loading Survey Scans...' + SurvexScanSingle.objects.all().delete() SurvexScansFolder.objects.all().delete()