static files redone

core/TESTS/tests.py

@@ -66,7 +66,7 @@ class SimpleTest(SimpleTestCase):
         from django.db import connection, close_old_connections, connections
         from django.contrib.auth.models import User
         from django.http import HttpResponse
-        from django.core.urlresolvers import reverse
+        from django.urls import reverse
 
 __test__ = {"doctest": """
 Another way to test that 1 + 1 is equal to 2.

core/models.py

@@ -16,7 +16,8 @@ from django.contrib import admin
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
-from django.core.urlresolvers import reverse
+
+from django.urls import reverse
 from django.template import Context, loader
 
 import troggle.core.models_survex 

core/models_caves.py

@@ -15,7 +15,7 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Min, Max
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.template import Context, loader
 
 from troggle.core.models import TroggleModel, Person, Expedition

core/models_survex.py

@@ -4,7 +4,7 @@ import re
 
 from django.db import models
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 ###########################################################

core/view_surveys.py

@@ -12,7 +12,7 @@ def fa_readFile(*path):
     try:
         f = open(os.path.join(settings.FILES, *path))
     except:
-        f = urllib.request.urlopen(settings.FILES + "download/" + reduce(urljoin, path))
+        f = urllib.request.urlopen(settings.FILES+"download/")
     return f.read()
     
 def getMimeType(extension):
@@ -84,7 +84,15 @@ def surveyscansingle(request, path, file):
     survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file)
     return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=getMimeType(path.split(".")[-1]))
     #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings })
-    
+
+def expofilessingle(request, filepath):
+    fn=urllib.parse.unquote(filepath)
+    return HttpResponse(content=open(settings.EXPOFILES+fn,"rb"))
+
+def cssfilessingle(request, filepath):
+    fn=urllib.parse.unquote(filepath)
+    return HttpResponse(content=open(settings.MEDIA_ROOT+fn,"rb"),content_type="text/css")
+
 def surveyscansfolders(request):
     survexscansfolders = SurvexScansFolder.objects.all()
     return render_to_response('survexscansfolders.html', { 'survexscansfolders':survexscansfolders, 'settings': settings })

core/views_caves.py

@@ -9,7 +9,7 @@ from PIL import Image, ImageDraw, ImageFont
 from django import forms
 from django.conf import settings
 #from django.forms.models import modelformset_factory
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 

core/views_logbooks.py

@@ -4,7 +4,7 @@ import re
 
 import django.db.models
 from django.db.models import Min, Max
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render, render_to_response
 from django.template import Context, loader
@@ -185,11 +185,9 @@ def experimental(request):
     addupsurvexlength = 0
     for expedition in Expedition.objects.all():
         survexblocks = expedition.survexblock_set.all()
-        #survexlegs = [ ]
         legsyear=0
         survexleglength = 0.0
         for survexblock in survexblocks:
-            #survexlegs.extend(survexblock.survexleg_set.all())
             survexleglength += survexblock.totalleglength
             try:
                 legsyear += int(survexblock.text)
@@ -199,9 +197,6 @@ def experimental(request):
         legsbyexpo.append((expedition, {"nsurvexlegs":legsyear, "survexleglength":survexleglength}))
     legsbyexpo.reverse() 
 
-    #removing survexleg objects completely
-    #survexlegs = models.SurvexLeg.objects.all()
-    #totalsurvexlength = sum([survexleg.tape  for survexleg in survexlegs])
     return render(request, 'experimental.html', { "nsurvexlegs":nimportlegs, "totalsurvexlength":totalsurvexlength, "addupsurvexlength":addupsurvexlength, "legsbyexpo":legsbyexpo })
 
 @login_required_if_public

core/views_other.py

@@ -2,7 +2,7 @@ import re
 
 from django import forms
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
@@ -11,7 +11,6 @@ from django.template import Context, loader
 import troggle.parsers.imports
 from troggle.core.models import Expedition, Person, PersonExpedition
 from troggle.core.models_caves import LogbookEntry, QM, Cave, PersonTrip
-#from troggle.core.models_survex import SurvexLeg
 from troggle.helper import login_required_if_public
 from troggle.core.forms import UploadFileForm
 
@@ -27,7 +26,6 @@ def frontpage(request):
     expeditions =  Expedition.objects.order_by("-year")
     logbookentry = LogbookEntry
     cave = Cave
-    #photo = DPhoto
     from django.contrib.admin.templatetags import log
     return render(request,'frontpage.html', locals())
 

core/views_statistics.py

@@ -4,8 +4,8 @@ import re
 
 import django.db.models
 from django.db.models import Min, Max
-from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseRedirect
+#from django.urls import reverse, resolve
+#from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render, render_to_response
 from django.template import Context, loader
 from django.template.defaultfilters import slugify
@@ -22,9 +22,7 @@ from settings import *
 
 def pathsreport(request):
     pathsdict={
-    "ADMIN_MEDIA_PREFIX" : ADMIN_MEDIA_PREFIX,
-    "ADMIN_MEDIA_PREFIX" : ADMIN_MEDIA_PREFIX,
-    "CAVEDESCRIPTIONSX" : CAVEDESCRIPTIONS,
+    "CAVEDESCRIPTIONS" : CAVEDESCRIPTIONS,
     "DIR_ROOT" : DIR_ROOT,
     "ENTRANCEDESCRIPTIONS" : ENTRANCEDESCRIPTIONS,
     "EXPOUSER_EMAIL" : EXPOUSER_EMAIL,
@@ -36,25 +34,19 @@ def pathsreport(request):
     "JSLIB_URL" : JSLIB_URL,
     "LOGFILE" : LOGFILE,
     "LOGIN_REDIRECT_URL" : LOGIN_REDIRECT_URL,
-    "MEDIA_ADMIN_DIR" : MEDIA_ADMIN_DIR,
     "MEDIA_ROOT" : MEDIA_ROOT,
     "MEDIA_URL" : MEDIA_URL,
-    #"PHOTOS_ROOT" : PHOTOS_ROOT,
     "PHOTOS_URL" : PHOTOS_URL,
     "PYTHON_PATH" : PYTHON_PATH,
     "REPOS_ROOT_PATH" : REPOS_ROOT_PATH,
     "ROOT_URLCONF" : ROOT_URLCONF,
-    "STATIC_ROOT" : STATIC_ROOT,
     "STATIC_URL" : STATIC_URL,
     "SURVEX_DATA" : SURVEX_DATA,
     "SURVEY_SCANS" : SURVEY_SCANS,
     "SURVEYS" : SURVEYS,
     "SURVEYS_URL" : SURVEYS_URL,
     "SVX_URL" : SVX_URL,
-#    "TEMPLATE_DIRS" : TEMPLATE_DIRS,
     "THREEDCACHEDIR" : THREEDCACHEDIR,
-#    "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT,
-#    "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL,
     "TUNNEL_DATA" : TUNNEL_DATA,
     "URL_ROOT" : URL_ROOT
     }