Merge from Martin's tip

1 files changed, 19 insertions, 0 deletions

diff --git a/core/models_survex.py b/core/models_survex.py
index ed21658..efd3022 100644
--- a/core/models_survex.py
+++ b/core/models_survex.py
@@ -52,10 +52,20 @@ class SurvexFile(models.Model):
 class SurvexEquate(models.Model):

     cave        = models.ForeignKey('Cave', blank=True, null=True)

 

+class SurvexStationLookUpManager(models.Manager):

+    def lookup(self, name):

+        blocknames, sep, stationname = name.rpartition(".")

+        return self.get(block = SurvexBlock.objects.lookup(blocknames),

+                        name = stationname)

+

 class SurvexStation(models.Model):

     name        = models.CharField(max_length=20)   

     block       = models.ForeignKey('SurvexBlock')

     equate      = models.ForeignKey('SurvexEquate', blank=True, null=True)

+    objects = SurvexStationLookUpManager()

+    x = models.FloatField(blank=True, null=True)

+    y = models.FloatField(blank=True, null=True)

+    z = models.FloatField(blank=True, null=True)

 

 class SurvexLeg(models.Model):

     block       = models.ForeignKey('SurvexBlock')

@@ -70,7 +80,16 @@ class SurvexLeg(models.Model):
 #

 # Single SurvexBlock 

 # 

+class SurvexBlockLookUpManager(models.Manager):

+    def lookup(self, name):

+        blocknames = name.split(".")

+        block = SurvexBlock.objects.get(parent=None, survexfile__path="all")

+        for blockname in blocknames:

+            block = SurvexBlock.objects.get(parent=block, name=blockname)

+        return block

+

 class SurvexBlock(models.Model):

+    objects = SurvexBlockLookUpManager()

     name       = models.CharField(max_length=100)

     parent     = models.ForeignKey('SurvexBlock', blank=True, null=True)

     text       = models.TextField()