Changeset 5079

Timestamp:

24 Mar 2010, 12:57:53 (15 years ago)

Author:

uli

Message:

• Let component implementations apply to new interfaces.

• Make access codes retrive their batch-specific values from parent in order not to waste memory.

• Make AccessCodeBatch? a real container.

• Let AccessCodePlugin? create accesscode container on setup of waeup.sirp.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

@@ -4 +4 @@
 from random import SystemRandom as random
 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
-from waeup.sirp.accesscodes.interfaces import IAccessCode, IAccessCodeBatch
+from waeup.sirp.accesscodes.interfaces import (
+    IAccessCode, IAccessCodeBatch, IAccessCodeBatchContainer
+    )
 
 class AccessCode(grok.Model):
     grok.implements(IAccessCode)
 
-    def __init__(self, batch_serial, batch_prefix, batch_num, random_num,
-                 cost, invalidation_date=None, student_id=None):
+    def __init__(self, batch_serial, random_num, cost,
+                 invalidation_date=None, student_id=None):
         self.batch_serial = batch_serial
-        self.batch_prefix = batch_prefix.upper()
-        self.batch_num = str(batch_num)
         self.random_num = random_num
         self.cost = cost
@@ -24 +24 @@
             self.batch_prefix, self.batch_num, self.random_num)
 
+    @property
+    def batch(self):
+        return getattr(self, '__parent__', None)
+    
+    @property
+    def batch_prefix(self):
+        if self.batch is None:
+            return ''
+        return self.batch.prefix
+    
+    @property
+    def batch_num(self):
+        if self.batch is None:
+            return ''
+        return self.batch.num
 
-class AccessCodeBatch(object):
+class AccessCodeBatch(grok.Container):
     """A batch of access codes.
     """
@@ -32 +47 @@
     def __init__(self, creation_date, creator, batch_num, batch_prefix, cost,
                  entry_num):
+        super(AccessCodeBatch, self).__init__()
         self.creation_date = creation_date
         self.creator = creator
-        self.batch_num = batch_num
-        self.batch_prefix = batch_prefix
+        self.num = batch_num
+        self.prefix = batch_prefix
         self.cost = cost
         self.entry_num = entry_num
+        self._createEntries()
+
+    def _createEntries(self):
+        """Create the entries for this batch.
+        """
         self._used = []
-
-    def __iter__(self):
-        if len(self._used) >= self.entry_num:
-            for num in range(self.entry_num):
-                random_num = self._used[num]
-                ac = AccessCode(len(self._used), self.batch_prefix,
-                                self.batch_num, random_num, self.cost)
-                yield ac
-        else:
-            while len(self._used) < self.entry_num:
-                random_num = self.getNewRandomNum()
-                ac = AccessCode(len(self._used), self.batch_prefix,
-                                self.batch_num, random_num, self.cost)
-                self._used.append(random_num)
-                yield ac
+        for num in range(self.entry_num):
+            random_num = self.getNewRandomNum()
+            ac = AccessCode(num, random_num, self.cost)
+            self[str(num)] = ac
+        del self._used
         
     def getNewRandomNum(self):
@@ -67 +78 @@
         return result
 
-class AccessCodeContainer(grok.Container):
-    pass
+class AccessCodeBatchContainer(grok.Container):
+    grok.implements(IAccessCodeBatchContainer)
+
+    def addBatch(self, batch):
+        key = "%s_%s" % (batch.prefix, batch.num)
+        self[key] = batch
 
 class AccessCodePlugin(grok.GlobalUtility):
@@ -75 +90 @@
 
     def setup(self, site, name, logger):
-        pass
+        site['accesscodes'] = AccessCodeBatchContainer()
+        logger.info('Installed container for access code batches.')
+        return
 
     def update(self, site, name, logger):