Changeset 6449 for main

Timestamp:

21 Jun 2011, 15:23:57 (14 years ago)

Author:

Henrik Bettermann

Message:

Fix reimport of Ac batches. This is temporary reimport solution. Access codes will be imported with status initialized no matter if they have been used before.

File:

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

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

@@ -256 +256 @@
             yield filename
 
+    # This is temporary reimport solution. Access codes will be imported
+    # with status initialized no matter if they have been used before.
     def reimport(self, filename, creator=u'UNKNOWN'):
         """Reimport a batch given in CSV file.
@@ -265 +267 @@
         reader = csv.DictReader(open(path, 'rb'), quoting=csv.QUOTE_ALL)
         entry = reader.next()
-        cost = float(entry['cost'])
+        cost = float(entry['serial'])
         num = int(entry['ac'])
-        batch_name = '%s-%s' % (entry['serial'], num)
+        prefix = entry['prefix']
+        batch_name = '%s-%s' % (prefix, num)
         if batch_name in self.keys():
             raise KeyError('Batch already exists: %s' % batch_name)
-        #batch = AccessCodeBatch(
-        #    datetime.now(), creator, entry['serial'], cost, 0, num=num)
         batch = AccessCodeBatch(
-            datetime.now(), creator, entry['serial'], cost, 0, num=0)
+            datetime.now(), creator, prefix, cost, 0, num=num)
         num_entries = 0
         self[batch_name] = batch