diff options
Diffstat (limited to 'core/view_surveys.py')
| -rw-r--r-- | core/view_surveys.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/view_surveys.py b/core/view_surveys.py index a6df780..0e958c7 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -23,7 +23,7 @@ def getMimeType(extension): def listdir(request, path): #try: - return HttpResponse(fileAbstraction.listdir(path), mimetype = "text/plain") + return HttpResponse(fileAbstraction.listdir(path), content_type="text/plain") #except: # raise Http404 @@ -33,7 +33,7 @@ def upload(request, path): def download(request, path): #try: - return HttpResponse(fileAbstraction.readFile(path), mimetype=getMimeType(path.split(".")[-1])) + return HttpResponse(fileAbstraction.readFile(path), content_type=getMimeType(path.split(".")[-1])) #except: # raise Http404 @@ -46,6 +46,7 @@ extmimetypes = {".txt": "text/plain", ".html": "text/html", ".png": "image/png", ".jpg": "image/jpeg", + ".jpeg": "image/jpeg", } # dead @@ -93,9 +94,9 @@ def jgtfile(request, f): fin = open(fp) ftext = fin.read() fin.close() - return HttpResponse(ftext, mimetype=mimetype) + return HttpResponse(ftext, content_type=mimetype) - return HttpResponse("unknown file::%s::" % f, mimetype = "text/plain") + return HttpResponse("unknown file::%s::" % f, content_type = "text/plain") def UniqueFile(fname): @@ -171,7 +172,7 @@ def surveyscansfolder(request, path): def surveyscansingle(request, path, file): survexscansfolder = SurvexScansFolder.objects.get(walletname=path) survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file) - return HttpResponse(content=open(survexscansingle.ffile), mimetype="image/png") + return HttpResponse(content=open(survexscansingle.ffile), content_type=getMimeType(path.split(".")[-1])) #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) def surveyscansfolders(request): @@ -187,7 +188,7 @@ def tunneldata(request): def tunnelfile(request, path): tunnelfile = TunnelFile.objects.get(tunnelpath=path) tfile = os.path.join(settings.TUNNEL_DATA, tunnelfile.tunnelpath) - return HttpResponse(content=open(tfile), mimetype="text/plain") + return HttpResponse(content=open(tfile), content_type="text/plain") def tunnelfileupload(request, path): tunnelfile = TunnelFile.objects.get(tunnelpath=path) @@ -202,13 +203,13 @@ def tunnelfileupload(request, path): uploadedfile = request.FILES.values()[0] if uploadedfile.field_name != "sketch": - return HttpResponse(content="Error: non-sketch file uploaded", mimetype="text/plain") + return HttpResponse(content="Error: non-sketch file uploaded", content_type="text/plain") if uploadedfile.content_type != "text/plain": - return HttpResponse(content="Error: non-plain content type", mimetype="text/plain") + return HttpResponse(content="Error: non-plain content type", content_type="text/plain") # could use this to add new files if os.path.split(path)[1] != uploadedfile.name: - return HttpResponse(content="Error: name disagrees", mimetype="text/plain") + return HttpResponse(content="Error: name disagrees", content_type="text/plain") orgsize = tunnelfile.filesize # = os.stat(tfile)[stat.ST_SIZE] @@ -226,7 +227,7 @@ def tunnelfileupload(request, path): uploadedfile.close() message = "File size %d overwritten with size %d" % (orgsize, tunnelfile.filesize) - return HttpResponse(content=message, mimetype="text/plain") + return HttpResponse(content=message, content_type="text/plain") |