static files redone

1 files changed, 10 insertions, 2 deletions

diff --git a/core/view_surveys.py b/core/view_surveys.py
index 4b82b3a..6d5ed22 100644
--- a/core/view_surveys.py
+++ b/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 })