diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2023-02-26 22:13:37 +0000 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2023-02-26 22:13:37 +0000 |
| commit | 6de4fa66a2ea7986230c3bb0f64887488acaa33f (patch) | |
| tree | 8907e1988764da4b090636b1efeee79021af7c9e /core/models | |
| parent | 394d94d5d6916b3aa61c7f89ce1b37798d3a87a1 (diff) | |
| download | troggle-6de4fa66a2ea7986230c3bb0f64887488acaa33f.tar.gz troggle-6de4fa66a2ea7986230c3bb0f64887488acaa33f.tar.bz2 troggle-6de4fa66a2ea7986230c3bb0f64887488acaa33f.zip | |
Initial add of On This Day links to svx file page
Diffstat (limited to 'core/models')
| -rw-r--r-- | core/models/caves.py | 2 | ||||
| -rw-r--r-- | core/models/survex.py | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index dffd670..1de5ef9 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -32,6 +32,8 @@ todo = """ foreign keys work fine ?! - Why do we have CaveAndEntrance objects ? Surely entranceletter belong son the Entrance object? + +- move the aliases list from the code and put into an editable file - Restore constraint: unique_together = (("area", "kataster_number"), ("area", "unofficial_number")) """ diff --git a/core/models/survex.py b/core/models/survex.py index 338a235..c6d6af1 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -1,6 +1,7 @@ import os import re from urllib.parse import urljoin +from pathlib import Path from django.conf import settings from django.db import models @@ -39,8 +40,8 @@ class SurvexFile(models.Model): # return "[SurvexFile:"+str(self.path) + "-" + str(self.survexdirectory) + "-" + str(self.cave)+"]" def exists(self): - fname = os.path.join(settings.SURVEX_DATA, self.path + ".svx") - return os.path.isfile(fname) + fname = Path(settings.SURVEX_DATA, self.path + ".svx") + return fname.is_file() def OpenFile(self): fname = os.path.join(settings.SURVEX_DATA, self.path + ".svx") @@ -64,6 +65,8 @@ class SurvexFile(models.Model): class SurvexStationLookUpManager(models.Manager): + """Don't know what this does, + https://docs.djangoproject.com/en/dev/topics/db/managers/""" def lookup(self, name): blocknames, sep, stationname = name.rpartition(".") return self.get(block=SurvexBlock.objects.lookup(blocknames), name__iexact=stationname) @@ -99,9 +102,8 @@ class SurvexStation(models.Model): # Single SurvexBlock # class SurvexBlockLookUpManager(models.Manager): - """Don't know what this does, suspect it is part of the Django admin - system""" - + """Don't know what this does, + https://docs.djangoproject.com/en/dev/topics/db/managers/ """ def lookup(self, name): if name == "": blocknames = [] |