Index: /WAeUP_SRP/trunk/WAeUPTables.py
===================================================================
--- /WAeUP_SRP/trunk/WAeUPTables.py	(revision 5582)
+++ /WAeUP_SRP/trunk/WAeUPTables.py	(revision 5583)
@@ -775,5 +775,5 @@
             return        
         fields = [field for field in self.schema()]
-        export_fields = ['username','firstname','lastname','email','current_session','reg_state','password']
+        export_fields = ['username','firstname','lastname','email','currentsession','regstate','password','city','country','deleted']
         format = ','.join(['"%%(%s)s"' % fn for fn in export_fields])
         csv = []
@@ -787,9 +787,16 @@
             if len(records) == 0:
                 raise KeyError("No record for uid %s" % uid)
-            rec = self.record2dict(fields,records[0],None)            
-            rec['firstname'] = rec['firstname'] + rec['middlename']
-            rec.update({'reg_state':rec['review_state']})
-            rec['current_session'] = rec['session']
+            rec = self.record2dict(fields,records[0],None)    
+            fn = rec['firstname'].replace(',',' ')  
+            mn = rec['middlename'].replace(',',' ')
+            ln = rec['lastname'].replace(',',' ')
+            rec['firstname'] = fn + ' ' + mn
+            rec['lastname'] = ln
+            rec['regstate'] = rec['review_state']
+            rec['currentsession'] = rec['session']
             rec['username'] = rec['id']
+            rec['city'] = ''
+            rec['country'] = 'ng'
+            rec['deleted'] = '0'
             rec['password'] = self.waeup_tool.getCredential(rec['id'])
             csv.append(format % rec)
