Changeset 2675 for WAeUP_SRP/base/Widgets.py

Timestamp:

16 Nov 2007, 09:45:30 (17 years ago)

Author:

joachim

Message:

new images directory structure

File:

• WAeUP_SRP/base/Widgets.py (modified) (6 diffs)

WAeUP_SRP/base/Widgets.py

@@ -21 +21 @@
 from Products.WAeUP_SRP.Students import getStudentByRegNo
 from Products.WAeUP_SRP.Academics import makeCertificateCode
+from Products.WAeUP_SRP.WAeUPTool import getImagesDir
 #from Products.ExtFile.ExtFile import ExtFile
 import logging,os,re
@@ -1804 +1805 @@
     )
     path = "images"
-    storage_path = "%s/%s" % (i_home,path)
+    #storage_path = "%s/%s" % (i_home,path)
     id_field = ""
     show_image = False
@@ -1814 +1815 @@
         else:
             student_id = datastructure[self.id_field]
-        student_path = os.path.join(self.storage_path,
-                                    student_id)
+        # student_path = os.path.join(self.storage_path,
+        #                             student_id)
+        student_path = getImagesDir(student_id)
         image_name = ''
         content_url = ''
@@ -1827 +1829 @@
             info['image_name'] = image_name
             info['content_url'] = os.path.join(self.portal_url(),
-                                   "viewimage",
-                                   self.path,
-                                   student_id,
-                                   image_name,
-                                   )
-            info['current_filename'] = os.path.join(student_id,
-                                                    image_name)
-            info['file_path'] = os.path.join(self.storage_path,
-                                             info['current_filename'])
+                                               "viewimage",
+                                               student_id,
+                                               image_name,
+                                              )
+            info['current_filename'] =  image_name
+            info['file_path'] = os.path.join(student_path, image_name)
         return info
 
@@ -1945 +1944 @@
             student_id = datastructure[self.id_field]
         if student_id is not None:
-            student_path = os.path.join(self.storage_path,student_id)
+            # student_path = os.path.join(self.storage_path,
+            #                             student_id)
+            student_path = getImagesDir(student_id)
             if not os.path.exists(student_path):
                 self.waeup_tool.moveImagesToFS(student_id)
@@ -2038 +2039 @@
                 file.content_type = mimetype
             # Store the file in the filesystem
-            student_path = os.path.join(self.storage_path,student_id)
+            #student_path = os.path.join(self.storage_path,student_id)
+            student_path = getImagesDir(student_id)
             if not os.path.exists(student_path):
                 os.mkdir(student_path)