OO-1259: map m and f to gender, more commit, use log

src/main/java/org/olat/ldap/manager/LDAPGroupVisitor.java

@@ -28,6 +28,8 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchResult;
 
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
 import org.olat.ldap.model.LDAPGroup;
 
 /**
@@ -37,6 +39,8 @@ import org.olat.ldap.model.LDAPGroup;
  *
  */
 public class LDAPGroupVisitor implements LDAPVisitor {
+	
+	private static final OLog log = Tracing.createLoggerFor(LDAPGroupVisitor.class);
 
 	private final List<LDAPGroup> groups = new ArrayList<LDAPGroup>();
 	
@@ -65,7 +69,7 @@ public class LDAPGroupVisitor implements LDAPVisitor {
 				}
 			}
 		} catch (NamingException e) {
-			e.printStackTrace();
+			log.error("", e);
 		}
 		group.setMembers(members);
 		groups.add(group);

src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java

@@ -1140,12 +1140,16 @@ public class LDAPLoginManagerImpl implements LDAPLoginManager, GenericEventListe
 		List<Identity> currentMembers = businessGroupRelationDao
 				.getMembers(businessGroup, GroupRoles.coach.name(), GroupRoles.participant.name());
 
+		int count = 0;
 		for(String member:members) {
 			LDAPUser ldapUser = getLDAPUser(ctx, member, dnToIdentityKeyMap, errors);
 			if(ldapUser != null) {
 				Identity identity = ldapUser.getCachedIdentity();
 				syncMembership(businessGroup, identity, ldapUser.isCoach());
 				currentMembers.remove(identity);
+				if(++count % 20 == 0) {
+					dbInstance.commitAndCloseSession();
+				}
 			}
 		}
 		
@@ -1153,6 +1157,9 @@ public class LDAPLoginManagerImpl implements LDAPLoginManager, GenericEventListe
 			List<String> roles = businessGroupRelationDao.getRoles(currentMember, businessGroup);
 			for(String role:roles) {
 				businessGroupRelationDao.removeRole(currentMember, businessGroup, role);
+				if(++count % 20 == 0) {
+					dbInstance.commitAndCloseSession();
+				}
 			}
 		}
 	}

src/main/java/org/olat/user/propertyhandlers/GenderPropertyHandler.java

@@ -64,6 +64,17 @@ public class GenderPropertyHandler extends AbstractUserPropertyHandler {
 		return values;
 	}
 
+	@Override
+	public void setUserProperty(User user, String value) {
+		if(value != null) {
+			if("m".equals(value)) {
+				value = "male";
+			} else if("f".equals(value)) {
+				value = "female";
+			}	
+		}
+		super.setUserProperty(user, value);
+	}
 
 	/**
 	 * @see org.olat.user.AbstractUserPropertyHandler#getUserProperty(org.olat.core.id.User, java.util.Locale)