summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2015-01-19 22:48:50 +0000
committerSam Wenham <sam@wenhams.co.uk>2015-01-19 22:48:50 +0000
commit67f94f94364a425aa9b98722bb2af8726622a185 (patch)
tree40e9daf1b5826ba5e8fe7a768d28e2c1b3be3062
parent118666296091d7a7236833775a00435bc6a5fe83 (diff)
downloadtroggle-67f94f94364a425aa9b98722bb2af8726622a185.tar.gz
troggle-67f94f94364a425aa9b98722bb2af8726622a185.tar.bz2
troggle-67f94f94364a425aa9b98722bb2af8726622a185.zip
A little more verbosity
-rw-r--r--parsers/survex.py6
-rw-r--r--parsers/surveys.py4
2 files changed, 8 insertions, 2 deletions
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()