Changeset 2675 for WAeUP_SRP/base/WAeUPTool.py

Timestamp:

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

Author:

joachim

Message:

new images directory structure

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (7 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -54 +54 @@
 images_base = os.path.join(i_home,"images")
 
+def getImagesDir(student_id):
+    return os.path.join("%s" % images_base,student_id[0],student_id)
 
 def getObject(object,name):
@@ -468 +470 @@
     ###)
 
+
     security.declarePublic('loadStudentFoto') ###(
     def loadStudentFoto(self,student,filename,folder):
@@ -474 +477 @@
         picture ="%s/import/%s/%s" % (i_home,folder,filename)
         student_id = student.getId()
-        images_dir = os.path.join("%s" % images_base,student_id)
+        images_dir = getImagesDir(student_id)
         if not os.path.exists(images_dir):
             os.mkdir(images_dir)
@@ -847 +850 @@
                                                               brain.screening_type,
                                                               brain.reg_no)
-        images_dir = os.path.join("%s" % images_base,student_id)
+        images_dir = getImagesDir(student_id)
+        #images_dir = os.path.join("%s" % images_base,student_id)
+        letter_dir,student_dir = os.path.split(images_dir)
+        if not os.path.exists(letter_dir):
+            os.mkdir(letter_dir)
         if not os.path.exists(images_dir):
             os.mkdir(images_dir)
@@ -946 +953 @@
         if student_id is None:
             return False
-        picture_path = os.path.join(images_base,student_id)
+        picture_path = getImagesDir(student_id)
+        #picture_path = os.path.join(images_base,student_id)
         if not os.path.exists(picture_path):
             return False
@@ -967 +975 @@
     def showFsPicture(self,path):
         """return a picture from the filesystem"""
-        picture_path = os.path.join(i_home,path)
+        #picture_path = os.path.join(i_home,path)
+        picture_path = os.path.join(images_base,path)
         response = self.REQUEST.RESPONSE
         #import pdb;pdb.set_trace()
@@ -1851 +1860 @@
     def moveImagesToFS(self,student_id="O738726"):
         "move the images to the filesystem"
-        images_dir = os.path.join("%s" % images_base,student_id)
+        images_dir = getImagesDir(student_id)
+        #images_dir = os.path.join("%s" % images_base,student_id)
         student_folder = getattr(self.portal_url.getPortalObject().campus.students,student_id)
         stool = getToolByName(self, 'portal_schemas')