enable non-cave html and images redirection

1 files changed, 8 insertions, 3 deletions

diff --git a/core/views/caves.py b/core/views/caves.py
index 2a1e726..1f89376 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -15,6 +15,7 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 
 import troggle.settings as settings
 #import troggle.core.models as models
+from troggle.core.views import expo
 from troggle.core.models import Expedition, DataIssue
 from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation, GetCaveLookup
 from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm
@@ -138,7 +139,11 @@ def cave3d(request, cave_id=''):
     return response
 
 def cavepage(request, karea, subpath):
-    '''Displays a cave description page'''
+    '''Displays a cave description page
+    
+    There are A LOT OF URLS to e.g. /1623/161/l/rl89a.htm which are IMAGES and html files
+    in cave descriptions. These need to be handled HERE
+    '''
     path = karea + subpath
     print(" ! cavepage:'{}' kataster area:'{}' rest of path:'{}'".format(path, karea, subpath))
     
@@ -146,13 +151,13 @@ def cavepage(request, karea, subpath):
         cave = Cave.objects.get(url = path) # ideally this will be unique
         slug = cave.slug()
         print(" - cavepage:'{}' cave:'{}' cave-slug:'{}'".format(path, str(cave), slug))
-        #cave = Cave.objects.get(caveslug__slug = slug)
         if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated():
             return render(request,'nonpublic.html', {'instance': cave, 'cave_editable': slug})
         else:
             return render(request,'cave.html', {'cave': cave, 'cave_editable': slug})
     except Cave.DoesNotExist:
-        return render(request, 'pagenotfound.html', {'path': path})
+        # probably a link to text or an image e.g. 1623/161/l/rl89a.htm i.e. an expoweb page
+        return expo.expopage(request, path)
     except Cave.MultipleObjectsReturned:
         caves = Cave.objects.filter(url = path) 
         return render(request, 'svxcaveseveral.html', {'settings': settings, "caves":caves })