diff options
| author | expo on server <devnull@localhost> | 2019-06-26 03:32:18 +0100 |
|---|---|---|
| committer | expo on server <devnull@localhost> | 2019-06-26 03:32:18 +0100 |
| commit | 02d3cc84d5b6d9e7279a5e195f070c90ca1bf962 (patch) | |
| tree | d9f58bb282b2b7fce7a18e1ce7e992429d2468ee | |
| parent | b42249890e83fafdfd2f2918cd80f4621252f7ab (diff) | |
| download | troggle-02d3cc84d5b6d9e7279a5e195f070c90ca1bf962.tar.gz troggle-02d3cc84d5b6d9e7279a5e195f070c90ca1bf962.tar.bz2 troggle-02d3cc84d5b6d9e7279a5e195f070c90ca1bf962.zip | |
Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded.
| -rw-r--r-- | core/models_survex.py | 2 | ||||
| -rw-r--r-- | parsers/survex.py | 8 | ||||
| -rw-r--r-- | settings.py | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/core/models_survex.py b/core/models_survex.py index ed581a3..3bae04c 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -97,7 +97,7 @@ class SurvexBlockLookUpManager(models.Manager): blocknames = [] else: blocknames = name.split(".") - block = SurvexBlock.objects.get(parent=None, survexfile__path="all") + block = SurvexBlock.objects.get(parent=None, survexfile__path=settings.SURVEX_TOPNAME) for blockname in blocknames: block = SurvexBlock.objects.get(parent=block, name__iexact=blockname) return block diff --git a/parsers/survex.py b/parsers/survex.py index a999c43..294de73 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -249,7 +249,7 @@ def LoadAllSurvexBlocks(): print(" - Data flushed") - survexfile = models.SurvexFile(path="all", cave=None) + survexfile = models.SurvexFile(path=settings.SURVEX_TOPNAME, cave=None) survexfile.save() survexfile.SetDirectory() @@ -281,9 +281,9 @@ 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) + call([settings.CAVERN, "--output=%s%s.3d" % (settings.SURVEX_DATA, settings.SURVEX_TOPNAME), "%s%s.svx" % (settings.SURVEX_DATA, settings.SURVEX_TOPNAME)]) + call([settings.THREEDTOPOS, '%s%s.3d' % (settings.SURVEX_DATA, settings.SURVEX_TOPNAME)], cwd = settings.SURVEX_DATA) + posfile = open("%s%s.pos" % (settings.SURVEX_DATA, settings.SURVEX_TOPNAME)) posfile.readline() #Drop header for line in posfile.readlines(): r = poslineregex.match(line) diff --git a/settings.py b/settings.py index 9770fd7..262b28e 100644 --- a/settings.py +++ b/settings.py @@ -53,6 +53,9 @@ SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/') PHOTOS_URL = urlparse.urljoin(URL_ROOT , '/photos/') SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/') +# top-level survex file basename (without .svx) +SURVEX_TOPNAME = "1623" + DEFAULT_LOGBOOK_PARSER = "Parseloghtmltxt" DEFAULT_LOGBOOK_FILE = "logbook.html" |