From 704ff8335dc78b497586e773c4ed7a596672b920 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Tue, 2 Jul 2024 20:01:15 +0300
Subject: still some bugs in cave ids

---
 core/models/caves.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'core/models/caves.py')

diff --git a/core/models/caves.py b/core/models/caves.py
index 691959b..c9405ee 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -108,6 +108,7 @@ class Cave(TroggleModel):
         ordering = ("kataster_code", "unofficial_number")
 
     def slug(self):
+        return self.newslug()
         primarySlugs = self.caveslug_set.filter(primary=True)
         if primarySlugs:
             return primarySlugs[0].slug
@@ -115,6 +116,8 @@ class Cave(TroggleModel):
             slugs = self.caveslug_set.filter()
             if slugs:
                 return slugs[0].slug
+            else:
+                return str(self.id)
                 
     def newslug(self):
         return f"{self.areacode}-{self.number()}"
@@ -521,9 +524,12 @@ def GetCaveLookup():
             checkcaveid(cave, fn)
 
         if cave.slug():
-            # also possibly done already
-            slug = cave.slug().lower()
-            checkcaveid(cave, slug)
+            # also possibly done already. checking for weird slug values..
+            try:
+                slug = cave.slug().lower()
+                checkcaveid(cave, slug)
+            except:
+                print(cave, cave.slug())
 
     # These might alse create more duplicate entries
     # Yes, this should be set in, and imported from, an easily editable file
@@ -667,9 +673,7 @@ def GetCaveLookup():
         ("gsh", "1623-291"),
         ("1623-2023-lc-01", "1623-318"),
         ("tempest", "1623-2023-lc-01"),
-       
-        ("1623-2023-kt-02", "2023-kt-02"),
-        
+               
 # from the git output after Becka's changes, used to construct this list..
  # rename caves-1623/{2023-ASH-15/2023-ASH-15.svx => 303/303.svx} (94%)
  # rename caves-1623/{2023-mg-02/2023-mg-02.svx => 304/304.svx} (90%)
@@ -753,7 +757,6 @@ def GetCaveLookup():
                 DataIssue.objects.update_or_create(parser="aliases", message=message)
             else:
                 message = f" *  Coding or cave existence mistake, cave for id '{alias}' does not exist. Expecting to set alias '{key}' to it"
-                print(message)
                 DataIssue.objects.update_or_create(parser="aliases", message=message)
 
     addmore = {}
-- 
cgit v1.2.3