Index: /main/waeup.kofa/trunk/tools/fix_import_file.py
===================================================================
--- /main/waeup.kofa/trunk/tools/fix_import_file.py	(revision 8477)
+++ /main/waeup.kofa/trunk/tools/fix_import_file.py	(revision 8478)
@@ -40,4 +40,5 @@
 # Converter (see below)
 OPTIONS = {
+    'student_id': 'student_id',
     'sex': 'gender',
     'birthday': 'date',
@@ -52,4 +53,5 @@
     'password': 'password',
     'phone': 'phone',
+    'nationality': 'nationality',
     'level': 'level',
     'start_level': 'level',
@@ -66,4 +68,5 @@
 COLNAME_MAPPING = {
     # base data
+    'reg_state': 'state',
     'jamb_reg_no': 'reg_number',
     'matric_no': 'matric_number',
@@ -94,5 +97,5 @@
     }
 
-# Mapping input regh_state --> output reg_state
+# Mapping input state --> output state
 REGSTATE_MAPPING = {
     'student_created': 'created',
@@ -128,4 +131,13 @@
     """Converters to turn old-style values into new ones.
     """
+
+    @classmethod
+    def student_id(self, value):
+        """ 'A123456' --> 'EA123456'
+        """
+        if len(value) == 7:
+            return 'E' + value
+        return value
+
     @classmethod
     def reg_state(self, value):
@@ -183,5 +195,13 @@
     def session(self, value):
         """ '08' --> '2008'
-        """
+        '2008/2009' --> '2008'
+        """
+        if '/' in value:
+            numbers = value.split('/')
+            number = int(numbers[0])
+            if number in range(2000,2015):
+                return number
+            else:
+                return 9999
         try:
             number = int(value)
@@ -274,4 +294,10 @@
 
     @classmethod
+    def nationality(self, value):
+        if value == "nigeria":
+            return "NG"
+        return value
+
+    @classmethod
     def phone(self, value):
         """ '<num-seq1>-<num-seq2> asd' -> '--<num-seq1><num-seq2>'
@@ -284,5 +310,5 @@
         match = RE_PHONE.match(value)
         phone = match.groups()[0]
-        value = '--%s' % phone
+        value = '-%s' % phone
         return value
 
