diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models_survex.py | 37 | ||||
| -rw-r--r-- | core/views_survex.py | 10 |
2 files changed, 23 insertions, 24 deletions
diff --git a/core/models_survex.py b/core/models_survex.py index 7f316c7..9578e78 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -52,8 +52,8 @@ class SurvexFile(models.Model): self.save() -class SurvexEquate(models.Model): - cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) +#class SurvexEquate(models.Model): +# cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) class SurvexStationLookUpManager(models.Manager): def lookup(self, name): @@ -64,7 +64,7 @@ class SurvexStationLookUpManager(models.Manager): class SurvexStation(models.Model): name = models.CharField(max_length=100) block = models.ForeignKey('SurvexBlock',on_delete=models.CASCADE) - equate = models.ForeignKey('SurvexEquate', blank=True, null=True,on_delete=models.CASCADE) +# equate = models.ForeignKey('SurvexEquate', blank=True, null=True,on_delete=models.CASCADE) objects = SurvexStationLookUpManager() x = models.FloatField(blank=True, null=True) y = models.FloatField(blank=True, null=True) @@ -140,22 +140,21 @@ class SurvexBlock(models.Model): res.append({'person':personrole.personexpedition.person, 'expeditionyear':personrole.personexpedition.expedition.year, 'roles':str(personrole.role)}) return res - def MakeSurvexStation(self, name): - ssl = self.survexstation_set.filter(name=name) - if ssl: - assert len(ssl) == 1 - return ssl[0] - #print name - ss = SurvexStation(name=name, block=self) - #ss.save() - return ss + # def MakeSurvexStation(self, name): + # ssl = self.survexstation_set.filter(name=name) + # if ssl: + # assert len(ssl) == 1 + # return ssl[0] + # ss = SurvexStation(name=name, block=self) + # #ss.save() + # return ss def DayIndex(self): return list(self.expeditionday.survexblock_set.all()).index(self) class SurvexTitle(models.Model): survexblock = models.ForeignKey('SurvexBlock',on_delete=models.CASCADE) - title = models.CharField(max_length=200) + title = models.CharField(max_length=200) # needed by svxcavesingle.html template cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) # @@ -217,14 +216,14 @@ class TunnelFile(models.Model): tunnelpath = models.CharField(max_length=200) tunnelname = models.CharField(max_length=200) bfontcolours = models.BooleanField(default=False) - manyscansfolders = models.ManyToManyField("ScansFolder") - scans = models.ManyToManyField("SingleScan") - survexblocks = models.ManyToManyField("SurvexBlock") + manyscansfolders = models.ManyToManyField("ScansFolder") # implicitly links to SVX files + scans = models.ManyToManyField("SingleScan") # implicitly links to SVX files +# survexblocks = models.ManyToManyField("SurvexBlock") tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type filesize = models.IntegerField(default=0) npaths = models.IntegerField(default=0) - survextitles = models.ManyToManyField("SurvexTitle") - - +# survextitles = models.ManyToManyField("SurvexTitle") + survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files + class Meta: ordering = ('tunnelpath',)
\ No newline at end of file diff --git a/core/views_survex.py b/core/views_survex.py index eff6315..eb807e4 100644 --- a/core/views_survex.py +++ b/core/views_survex.py @@ -14,12 +14,11 @@ from django.http import HttpResponse, Http404 import troggle.settings as settings import parsers.survex from troggle.core.models import Expedition, Person, PersonExpedition -from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory, SurvexTitle +from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory #, SurvexTitle from troggle.core.models_caves import Cave, PersonTrip, LogbookEntry from troggle.parsers.people import GetPersonExpeditionNameLookup - survextemplatefile = """; *** DO NOT SAVE THIS FILE WITHOUT RENAMING IT !! *** ;[Stuff in square brackets is example text to be replaced with real data, ; removing the square brackets] @@ -184,7 +183,6 @@ def svx(request, survex_file): if "diff" in rform.data: form.data['code'] = rcode - #process(survex_file) if 'code' not in form.data: form.data['code'] = form.GetDiscCode() @@ -231,19 +229,19 @@ def threed(request, survex_file): log = open(settings.SURVEX_DATA + survex_file + ".log", "rt",encoding='utf8') return HttpResponse(log, content_type="text") + def log(request, survex_file): process(survex_file) log = open(settings.SURVEX_DATA + survex_file + ".log", "rt",encoding='utf8') return HttpResponse(log, content_type="text") + def err(request, survex_file): process(survex_file) err = open(settings.SURVEX_DATA + survex_file + ".err", "rt",encoding='utf8') return HttpResponse(err, content_type="text") - - def identifycavedircontents(gcavedir): # find the primary survex file in each cave directory name = os.path.split(gcavedir)[1] @@ -339,6 +337,8 @@ def survexcaveslist(request): # parsing all the survex files of a single cave and showing that it's consistent and can find all the files and people # doesn't use recursion. just writes it twice + +# currently produces title and blank page.. link test is "dates and explorers" def survexcavesingle(request, survex_cave): breload = False cave = Cave.objects.get(kataster_number=survex_cave) |