From fc87e3a097ba7e35a0a0a6bd107d5801742c4db1 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Thu, 3 Mar 2011 21:16:39 -0400
Subject: [PATCH] Further decouple document file storage from file based
 storage

---
 apps/documents/conf/settings.py |  1 -
 apps/documents/models.py        | 12 +++---------
 apps/documents/storage.py       |  1 -
 settings.py                     |  1 -
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/apps/documents/conf/settings.py b/apps/documents/conf/settings.py
index 7e0fd9c6ec..064ecc0aa4 100755
--- a/apps/documents/conf/settings.py
+++ b/apps/documents/conf/settings.py
@@ -45,7 +45,6 @@ PAGE_COUNT_FUNCTION = getattr(settings, 'DOCUMENTS_PAGE_COUNT_FUNCTION', lambda
 
 # Storage
 STORAGE_BACKEND = getattr(settings, 'DOCUMENTS_STORAGE_BACKEND', DocumentStorage)
-STORAGE_DIRECTORY_NAME = getattr(settings, 'DOCUMENTS_STORAGE_DIRECTORY_NAME', 'documents')
 
 # Usage
 PREVIEW_SIZE = getattr(settings, 'DOCUMENTS_PREVIEW_SIZE', '640x480')
diff --git a/apps/documents/models.py b/apps/documents/models.py
index b487905935..867cf84a8d 100755
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -16,23 +16,17 @@ from documents.conf.settings import CHECKSUM_FUNCTION
 from documents.conf.settings import UUID_FUNCTION
 from documents.conf.settings import PAGE_COUNT_FUNCTION
 from documents.conf.settings import STORAGE_BACKEND
-from documents.conf.settings import STORAGE_DIRECTORY_NAME
 from documents.conf.settings import AVAILABLE_TRANSFORMATIONS
 from documents.conf.settings import DEFAULT_TRANSFORMATIONS
 
 
-
-def get_filename_from_uuid(instance, filename, directory=STORAGE_DIRECTORY_NAME):
-    populate_file_extension_and_mimetype(instance, filename)
-    return '%s/%s' % (directory, instance.uuid)
-
-def populate_file_extension_and_mimetype(instance, filename):
-    # First populate the file extension
+def get_filename_from_uuid(instance, filename):
     filename, extension = os.path.splitext(filename)
     instance.file_filename = filename
     #remove prefix '.'
     instance.file_extension = extension[1:]
-    
+    return instance.uuid
+   
 
 class DocumentType(models.Model):
     name = models.CharField(max_length=32, verbose_name=_(u'name'))    
diff --git a/apps/documents/storage.py b/apps/documents/storage.py
index f471f63eaf..2567a00d06 100755
--- a/apps/documents/storage.py
+++ b/apps/documents/storage.py
@@ -4,5 +4,4 @@ class DocumentStorage(FileSystemStorage):
     def __init__(self, *args, **kwargs):
         super(DocumentStorage, self).__init__(*args, **kwargs)
         self.location='document_storage'
-        self.base_url='document_storage'
 
diff --git a/settings.py b/settings.py
index b2cf2a0146..6f43445114 100755
--- a/settings.py
+++ b/settings.py
@@ -194,7 +194,6 @@ LOGIN_EXEMPT_URLS = (
 #DOCUMENTS_DEFAULT_TRANSFORMATIONS = []
 
 # Storage
-#DOCUMENTS_STORAGE_DIRECTORY_NAME = 'documents'
 #DOCUMENTS_STORAGE_BACKEND = DocumentStorage
 
 # Usage