Index: /main/waeup.sirp/trunk/tools/fix_import_file.py
===================================================================
--- /main/waeup.sirp/trunk/tools/fix_import_file.py	(revision 7525)
+++ /main/waeup.sirp/trunk/tools/fix_import_file.py	(revision 7526)
@@ -55,4 +55,6 @@
     'entry_session': 'session',
     'current_session': 'session',
+    'reg_state': 'reg_state',
+    'password': 'password',
     }
 
@@ -61,5 +63,20 @@
     'jamb_reg_no': 'reg_number',
     'birthday': 'date_of_birth',
+    'clr_ac_pin': 'clr_code',
     }
+
+# Mapping input regh_state --> output reg_state
+REGSTATE_MAPPING = {
+    'student_created': 'created',
+    'admitted': 'admitted',
+    'clearance_pin_entered': 'clearance started',
+    'clearance_requested': 'clearance requested',
+    'cleared_and_validated': 'cleared',
+    'school_fee_paid': 'school fee paid',
+    'returning': 'returning',
+    'courses_registered': 'courses registered',
+    'courses_validated': 'courses validated',
+    }
+
 ##
 ## END OF CONFIG
@@ -83,4 +100,12 @@
     """Converters to turn old-style values into new ones.
     """
+
+    @classmethod
+    def reg_state(self, value):
+        """ 'courses_validated' --> 'courses validated'
+        """
+        return REGSTATE_MAPPING.get(value,value)
+
+
     @classmethod
     def session(self, value):
@@ -112,10 +137,10 @@
     @classmethod
     def gender(self, value):
-        """ 'True'/'False' --> 'female'/'male'
+        """ 'True'/'False' --> 'f'/'m'
         """
         if value == 'True':
-            value = 'female'
+            value = 'f'
         elif value == 'False':
-            value = 'male'
+            value = 'm'
         else:
             value = ''
@@ -152,4 +177,11 @@
         #print "OUT: ", value
         return value
+
+    @classmethod
+    def password(self, value):
+        if value == "not set":
+            return ""
+        return value
+
 
 reader = csv.DictReader(open(INPUT_FILE, 'rb'))
