[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Users.java

[rico]

Update of 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory 
james.mmbase.org:/tmp/cvs-serv21717/src/org/mmbase/security/implementation/cloudcontext/builders

Modified Files:
        Users.java 
Log Message:
CaseSensitivity fixes and User fieldname fixes



See also: 
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders


Index: Users.java
===================================================================
RCS file: 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Users.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Users.java  30 Jun 2008 08:16:20 -0000      1.56
+++ Users.java  24 Sep 2008 09:56:31 -0000      1.57
@@ -31,7 +31,7 @@
  * @author Eduard Witteveen
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: Users.java,v 1.56 2008/06/30 08:16:20 michiel Exp $
+ * @version $Id: Users.java,v 1.57 2008/09/24 09:56:31 rico Exp $
  * @since  MMBase-1.7
  */
 public class Users extends MMObjectBuilder {
@@ -275,7 +275,7 @@
         MMObjectNode user = userCache.get(userName);
         if (user == null) {
             NodeSearchQuery nsq = new NodeSearchQuery(this);
-            StepField sf        = nsq.getField(getField("username"));
+            StepField sf        = nsq.getField(getField(FIELD_USERNAME));
             BasicFieldValueConstraint cons = new BasicFieldValueConstraint(sf, 
userName);
             cons.setCaseSensitive(userNameCaseSensitive);
             nsq.setConstraint(cons);
@@ -324,8 +324,9 @@
         relStep.setDirectionality(RelationStep.DIRECTIONS_SOURCE);
         relStep.setRole(new Integer(mmb.getRelDef().getNumberByName("rank")));
         if (userName != null) {
-            StepField sf2 = query.addField(relStep.getNext(), 
this.getField("username"));
-            Constraint cons2 = new BasicFieldValueConstraint(sf2, userName);
+            StepField sf2 = query.addField(relStep.getNext(), 
this.getField(FIELD_USERNAME));
+            BasicFieldValueConstraint cons2 = new 
BasicFieldValueConstraint(sf2, userName);
+            cons2.setCaseSensitive(userNameCaseSensitive);
             BasicCompositeConstraint composite = new 
BasicCompositeConstraint(CompositeConstraint.LOGICAL_AND);
             composite.addChild(cons);
             composite.addChild(cons2);
@@ -355,11 +356,16 @@
      * UserName must be unique, check it also here (to throw nicer exceptions)
      */
     public int insert(String owner, MMObjectNode node) {
+        String userName = node.getStringValue(FIELD_USERNAME);
+        if (!userNameCaseSensitive && userName!=null) {
+            userName=userName.toLowerCase();
+            node.setValue(FIELD_USERNAME,userName);
+        }
         int res = super.insert(owner, node);
-        String userName = node.getStringValue("username");
         NodeSearchQuery nsq = new NodeSearchQuery(this);
-        StepField sf        = nsq.getField(getField("username"));
-        Constraint cons = new BasicFieldValueConstraint(sf, userName);
+        StepField sf        = nsq.getField(getField(FIELD_USERNAME));
+        BasicFieldValueConstraint cons = new BasicFieldValueConstraint(sf, 
userName);
+        cons.setCaseSensitive(userNameCaseSensitive);
         nsq.setConstraint(cons);
         try {
             Iterator<MMObjectNode> i = getNodes(nsq).iterator();
@@ -510,7 +516,7 @@
     }
 
     public String toString(MMObjectNode n) {
-        return n.getStringValue("username");
+        return n.getStringValue(FIELD_USERNAME);
     }
 
     public boolean nodeLocalChanged(String machine, String number, String 
builder, String ctype) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs