Changeset 5112 for main/waeup.sirp/trunk

Timestamp:

1 Apr 2010, 10:35:49 (14 years ago)

Author:

uli

Message:

• Log creation of AC batches and their CSV files.

• Optimize computation of random numbers.

File:

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

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

@@ -63 +63 @@
         """Create the entries for this batch.
         """
-        self._used = []
+        rands = self.getNewRandomNum(num=self.entry_num)
         for num in range(self.entry_num):
-            random_num = self.getNewRandomNum()
-            ac = AccessCode(num, random_num, self.cost)
+            ac = AccessCode(num, rands[num], self.cost)
             self[str(num)] = ac
-        del self._used
-
-    def getNewRandomNum(self):
-        """Create a random number of 10 digits.
+        return
+        
+    def getNewRandomNum(self, num=1):
+        """Create a set of ``num`` random numbers of 10 digits each.
 
         The number is returned as string.
         """
-        result = ''
-        while result == '' or result in self._used:
-            result = ''
+        results = {}
+        while len(results) < num:
+            pin = ''
             for x in range(10):
-                result += str(random().randint(0, 9))
-        self._used.append(result)
-        return result
+                pin += str(random().randint(0, 9))
+            results[pin] = True
+        return results.keys()
 
     def createCSVLogFile(self):
@@ -109 +108 @@
                 [str(value.batch_serial), str(value.representation)]
                 )
+        logger = site.logger
+        logger.info(
+            "Created batch %s-%s" % (self.prefix, self.num))
+        logger.info(
+            "Written batch CSV to %s" % csv_path)
         return os.path.basename(csv_path)