Changeset 2632

Timestamp:

12 Nov 2007, 17:23:46 (17 years ago)

Author:

joachim

Message:

add student_levels, fix for #397,cleanup removeUnusedDocIds

Location:

WAeUP_SRP

Files:

• base/WAeUPTables.py (modified) (4 diffs)
• base/WAeUPTool.py (modified) (3 diffs)
• base/Widgets.py (modified) (1 diff)
• base/skins/waeup_student/get_student_levels.py (added)
• base/skins/waeup_student/study_course_view.pt (modified) (1 diff)
• uniben/profiles/default/layouts/student_study_course.xml (modified) (1 diff)
• uniben/profiles/default/vocabularies.xml (modified) (1 diff)
• uniben/profiles/default/vocabularies/student_levels.xml (added)

WAeUP_SRP/base/WAeUPTables.py

@@ -90 +90 @@
 ###)
 
-    def record2dict(self,fields,record):
+    def record2dict(self,fields,record): ###(
         d = {}
         for key in fields:
@@ -109 +109 @@
                 d[key] = ''
         return d
+
+###)
 
     def addRecord(self, **data): ###(
@@ -602 +604 @@
     #               "course_admitted",
     #               )
+    ###)
+
     def __init__(self,name=None):
         if name ==  None:
             name = self.name
         WAeUPTable.__init__(self, name)
-
-
 
     security.declareProtected(ModifyPortalContent,"new_importCSV")###(
@@ -722 +724 @@
                     logger.info("invalid mode: %s" % mode)
         logger.info("%(mode)sed %(imported)d records, invalid written to %(not_imported_fn)s" % d)
-###)
+    ###)
 
 InitializeClass(ApplicantsCatalog)

WAeUP_SRP/base/WAeUPTool.py

@@ -304 +304 @@
         repository = getToolByName(self, 'portal_repository')
         pxtool = getToolByName(self, 'portal_proxies')
+        logger.info('start')
         pxtool_infos = pxtool.getRevisionsUsed()
+        logger.info('found  %d used revisions ' % (len(pxtool_infos)))
 
         nb_revs = 0
@@ -310 +312 @@
         unused_docids_d = {} # all docids that are unused
         ids_unused_revs_docids = [] # ids for revs of unused docids
-        ids_unused_revs = [] # ids for unused revs
+        unused_ids = [] # ids for unused revs
         total = 0
         idlist = repository.objectIds()
+        to_delete = 0
+        found = False
         for id in idlist:
             docid, rev = repository._splitId(id)
@@ -319 +323 @@
                 continue
             nb_revs += 1
-            docids_d[docid] = None
             if not pxtool_infos.has_key(docid):
-                unused_docids_d[docid] = None
-                ids_unused_revs_docids.append(id)
-                ids_unused_revs.append(id)
+                found = True
+                to_delete += 1
+                unused_ids.append(id)
             elif not pxtool_infos[docid].has_key(rev):
-                ids_unused_revs.append(id)
-            if len(ids_unused_revs) >= max:
-                repository.manage_delObjects(ids_unused_revs)
+                found = True
+                to_delete += 1
+                unused_ids.append(id)
+            if found and not to_delete % max:
+                found = False
                 #import pdb;pdb.set_trace()
+                repository.manage_delObjects(unused_ids)
                 transaction.commit()
-                total += max
-                logger.info('removed %d total %d unused docids ' % (max,total))
-        anz = len(ids_unused_revs)
-        if anz > 0:
-            repository.manage_delObjects(ids_unused_revs)
-            transaction.commit()
-            total += anz
-            logger.info('finished removing %d unused docids ' % (total))
+                logger.info('removed %d total %d unused docids ' % (max,to_delete))
+        else:
+            if unused_ids:
+                repository.manage_delObjects(unused_ids)
+                transaction.commit()
+        logger.info('finished removing %d unused docids ' % (to_delete))
 
 

WAeUP_SRP/base/Widgets.py

@@ -276 +276 @@
         if len(v) == 1:
             v = value = '0%c' % v
+        elif len(v) == 9:
+            v = value[2:4]
         elif not value:
             v = value = self.getSessionId()[0]
         #import pdb;pdb.set_trace()
         sessions = self._getSessions()
-        if not sessions.has_key(value):
+        if not sessions.has_key(v):
             datastructure.setError(widget_id, "'%s' not a valid session key" % v)
             return 0

WAeUP_SRP/base/skins/waeup_student/study_course_view.pt

@@ -31 +31 @@
       <tr>
         <td width="220px">Current Study Level:</td> 
-        <td><span tal:content="python:context.portal_vocabularies.levels.get(info['doc'].current_level)" /></td>
+        <td><span tal:content="python:context.portal_vocabularies.student_levels.get(info['doc'].current_level)" /></td>
       </tr>
       <tr>

WAeUP_SRP/uniben/profiles/default/layouts/student_study_course.xml

@@ -59 +59 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">levels</property>
+  <property name="vocabulary">student_levels</property>
  </widget>
  <widget name="current_mode" meta_type="Select Widget">

WAeUP_SRP/uniben/profiles/default/vocabularies.xml

@@ -6 +6 @@
  <object name="acco_hall_reserved_rooms" meta_type="CPS Method Vocabulary"/>
  <object name="levels" meta_type="CPS Vocabulary"/>
+ <object name="student_levels" meta_type="CPS Method Vocabulary"/>
  <object name="csv_names" meta_type="CPS Method Vocabulary"/>
  <object name="entry_modes" meta_type="CPS Vocabulary"/>