removing redundant functions

2 files changed, 28 insertions, 30 deletions

diff --git a/core/view_surveys.py b/core/view_surveys.py
index d78c3e6..ae2d531 100644
--- a/core/view_surveys.py
+++ b/core/view_surveys.py
@@ -10,30 +10,30 @@ import urllib.request, urllib.parse, urllib.error
 
 # inlined use of fileabstraction into here 
 
-def fa_listdir(*path):
-    try:
-        strippedpath = [p for p in path if p]
-        root = os.path.join(settings.FILES, *strippedpath )
-        l = ""
-        #l = root + "\n"
-        isdir = os.path.isdir(root) #This seems to be required for os.path.isdir to work...
-        #l += str(isdir) + "\n"
-        for p in os.listdir(root):
-            if os.path.isdir(os.path.join(root, p)):
-                l += p + "/\n"
+# def fa_listdir(*path):
+    # try:
+        # strippedpath = [p for p in path if p]
+        # root = os.path.join(settings.FILES, *strippedpath )
+        # l = ""
+        # #l = root + "\n"
+        # isdir = os.path.isdir(root) #This seems to be required for os.path.isdir to work...
+        # #l += str(isdir) + "\n"
+        # for p in os.listdir(root):
+            # if os.path.isdir(os.path.join(root, p)):
+                # l += p + "/\n"
                 
-            elif os.path.isfile(os.path.join(root, p)):
-                l += p + "\n"
-            #Ignore non-files and non-directories
-        return l
-    except:
-        if strippedpath:
-            c = reduce(urljoin, strippedpath)
-        else:
-            c = ""
-        c = c.replace("#", "%23")
-        print(("FILE: ", settings.FILES + "listdir/" + c))
-        return urllib.request.urlopen(settings.FILES + "listdir/" + c).read()
+            # elif os.path.isfile(os.path.join(root, p)):
+                # l += p + "\n"
+            # #Ignore non-files and non-directories
+        # return l
+    # except:
+        # if strippedpath:
+            # c = reduce(urljoin, strippedpath)
+        # else:
+            # c = ""
+        # c = c.replace("#", "%23")
+        # print(("FILE: ", settings.FILES + "listdir/" + c))
+        # return urllib.request.urlopen(settings.FILES + "listdir/" + c).read()
         
 def fa_readFile(*path):
     try:
@@ -52,11 +52,11 @@ def getMimeType(extension):
         return "text/plain"
 
 
-def listdir(request, path):
-    #try:
-        return HttpResponse(fa_listdir(path), content_type="text/plain")
-    #except:
-    #    raise Http404
+# def listdir(request, path):
+    # #try:
+        # return HttpResponse(fa_listdir(path), content_type="text/plain")
+    # #except:
+    # #    raise Http404
 
 def upload(request, path):
     pass
diff --git a/urls.py b/urls.py
index 8824c60..ebce032 100644
--- a/urls.py
+++ b/urls.py
@@ -117,9 +117,7 @@ actualurlpatterns = patterns('',
     url(r'^survexfile/(?P<survex_cave>.*)$',          views_survex.survexcavesingle, name="survexcavessingle"),
     url(r'^survexfileraw/(?P<survex_file>.*?)\.svx$', views_survex.svxraw,           name="svxraw"),
 
-    (r'^survey_files/listdir/(?P<path>.*)$',       view_surveys.listdir),
     (r'^survey_files/download/(?P<path>.*)$',      view_surveys.download),
-    #(r'^survey_files/upload/(?P<path>.*)$', view_surveys.upload),
 
     #(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.SURVEY_SCANS, 'show_indexes':True}),
     url(r'^survey_scans/$',                        view_surveys.surveyscansfolders, name="surveyscansfolders"),