debugging Cave page links..

1 files changed, 7 insertions, 29 deletions

diff --git a/core/models/caves.py b/core/models/caves.py
index 0ede2b1..ea6fe9a 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -65,7 +65,7 @@ class CaveAndEntrance(models.Model):
 class Cave(TroggleModel):
     # too much here perhaps,
     areacode = models.CharField(max_length=4, blank=True, null=True) # could use models.IntegerChoices
-    subarea = models.CharField(max_length=10, blank=True, null=True) # 9, 8c etc.
+    subarea = models.CharField(max_length=25, blank=True, null=True) # 9, 8c etc.
     depth = models.CharField(max_length=100, blank=True, null=True)
     description_file = models.CharField(max_length=200, blank=True, null=True)
     entrances = models.ManyToManyField("Entrance", through="CaveAndEntrance")
@@ -89,34 +89,12 @@ class Cave(TroggleModel):
 
     # class Meta:
     #    unique_together = (("area", "kataster_number"), ("area", "unofficial_number"))
-    # FIXME Kataster Areas and CUCC defined sub areas need seperating
 
     # href    = models.CharField(max_length=100)
 
     class Meta:
         ordering = ("kataster_code", "unofficial_number")
 
-    def hassurvey(self):
-        """This is almost certainly a fossil - needs checking...
-        """
-        if not self.underground_centre_line:
-            return "No"
-        if (
-            self.survey.find("<img") > -1
-            or self.survey.find("<a") > -1
-            or self.survey.find("<IMG") > -1
-            or self.survey.find("<A") > -1
-        ):
-            return "Yes"
-        return "Missing"
-
-    def hassurveydata(self):
-        if not self.underground_centre_line:
-            return "No"
-        if self.survex_filcavee:
-            return "Yes"
-        return "Missing"
-
     def slug(self):
         primarySlugs = self.caveslug_set.filter(primary=True)
         if primarySlugs:
@@ -135,8 +113,8 @@ class Cave(TroggleModel):
         else:
             return self.unofficial_number
 
-    def reference(self):
-        return f"{self.kat_area()}-{self.number()}"
+    def reference(self): # tidy this up, no longer used?
+        return f"{self.areacode}-{self.number()}"
 
     def get_absolute_url(self):
         if self.kataster_number:
@@ -148,7 +126,10 @@ class Cave(TroggleModel):
         return Path(settings.URL_ROOT) / self.url  # not good Django style.. NEEDS actual URL
 
     def url_parent(self):
-        return self.url.rsplit("/", 1)[0]
+        if self.url:
+            return self.url.rsplit("/", 1)[0]
+        else:
+            return "NO cave.url"
 
     def __str__(self, sep=": "):
         return str(self.slug())
@@ -174,9 +155,6 @@ class Cave(TroggleModel):
         qms = self.get_open_QMs() | self.get_ticked_QMs() # set union operation
         return qms  # a QuerySet
         
-    def kat_area(self):
-        return self.areacode
-
     def entrances(self):
         return CaveAndEntrance.objects.filter(cave=self)