Index: /main/waeup.kofa/trunk/tools/fix_import_file.py
===================================================================
--- /main/waeup.kofa/trunk/tools/fix_import_file.py	(revision 8937)
+++ /main/waeup.kofa/trunk/tools/fix_import_file.py	(revision 8938)
@@ -85,4 +85,16 @@
     'lga': 'lga',
     'order_id': 'no_int',
+    'uniben': 'former',
+    'nysc_year': 'year',
+    'alr_date': 'date',
+    'fst_sit_date': 'date',
+    'scd_sit_date': 'date',
+    'emp_start': 'date',
+    'emp_end': 'date',
+    'emp_start2': 'date',
+    'emp_end2': 'date',
+    'fst_sit_results': 'result',
+    'scd_sit_results': 'result',
+    'alr_results': 'result',
     }
 
@@ -117,4 +129,18 @@
     'surcharge': 'surcharge_1',
     'session_id': 'p_session',
+    'hq_grade': 'hq_degree',
+    'uniben': 'former_matric',
+    'hq_type2': 'hq2_type',
+    'hq_grade2': 'hq2_degree',
+    'hq_school2': 'hq2_school',
+    'hq_matric_no2': 'hq2_matric_no',
+    'hq_session2': 'hq2_session',
+    'hq_disc2': 'hq2_disc',
+    'emp': 'employer',
+    'emp2': 'employer2',
+    'emp_position2': 'emp2_position',
+    'emp_start2': 'emp2_start',
+    'emp_end2': 'emp2_end',
+    'emp_reason2': 'emp2_reason',
     }
 
@@ -244,4 +270,24 @@
 
     @classmethod
+    def former(self, value):
+        """ True --> yes
+        '2008/2009' --> '2008'
+        """
+        if value == 'True':
+            return 'yes'
+        return
+
+    @classmethod
+    def year(self, value):
+        """ '0' --> ''
+        """
+        if value == '0':
+            return
+        if value == 'None':
+            return
+        return value
+
+
+    @classmethod
     def marit_stat(self, value):
         """ 'True'/'False' --> 'married'/'unmarried'
@@ -335,4 +381,6 @@
         of numbers.
         """
+        if not value:
+            return
         value = value.replace('-', '')
         value = value.replace('/', '')
@@ -340,6 +388,15 @@
         phone = match.groups()[0]
         value = '-%s' % phone
-        return value
-
+        return value + '#'
+
+    @classmethod
+    def result(self, value):
+        try:
+            liste = eval(value)
+        except:
+            return
+        if isinstance(liste,list):
+            return [(i[0].lower(),i[1]) for i in liste]
+        return
 
 def main():
