rename SurvexScansFolders and tidy survex parser

1 files changed, 6 insertions, 6 deletions

diff --git a/core/view_surveys.py b/core/view_surveys.py
index 76f7104..fbe5c6f 100644
--- a/core/view_surveys.py
+++ b/core/view_surveys.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.shortcuts import render_to_response
 from django.http import HttpResponse, Http404
 
-from troggle.core.models_survex import SurvexScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
+from troggle.core.models_survex import ScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
 from troggle.flatpages import views as flatviews
 import parsers.surveys
 #from . import fileAbstraction
@@ -69,12 +69,12 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary):
     return res.replace("\\", "/")
 
 def surveyscansfolder(request, path):
-    #print [ s.walletname  for s in SurvexScansFolder.objects.all() ]
-    survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path))
+    #print [ s.walletname  for s in ScansFolder.objects.all() ]
+    survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path))
     return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings })
 
 def surveyscansingle(request, path, file):
-    survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path))
+    survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path))
     survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file)
     print("SSS {} {} :{}:".format(path, file, flatviews.getmimetype(file)))
     return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=flatviews.getmimetype(file))
@@ -90,8 +90,8 @@ def cssfilessingle(request, filepath):
     return HttpResponse(content=open(settings.MEDIA_ROOT+fn,"r"),content_type="text/css")
 
 def surveyscansfolders(request):
-    survexscansfolders = SurvexScansFolder.objects.all()
-    return render_to_response('survexscansfolders.html', { 'survexscansfolders':survexscansfolders, 'settings': settings })
+    manyscansfolders = ScansFolder.objects.all()
+    return render_to_response('manyscansfolders.html', { 'manyscansfolders':manyscansfolders, 'settings': settings })
     
     
 def tunneldata(request):