svn commit: r1448038 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: data/user/dao/StateDao.java persistence/beans/user/State.java test/user/TestStateToLower.java

[sebawagner]

Author: sebawagner
Date: Wed Feb 20 08:35:59 2013
New Revision: 1448038

URL: http://svn.apache.org/r1448038
Log:
user real lower()

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestStateToLower.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java?rev=1448038&r1=1448037&r2=1448038&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java
 Wed Feb 20 08:35:59 2013
@@ -115,9 +115,12 @@ public class StateDao {
         */
        public State getStateByName(String name) {
                try {
+                       if (name == null) {
+                               return null;
+                       }
                        TypedQuery<State> query = em
                                        .createNamedQuery("getStateByName", 
State.class);
-                       query.setParameter("name", name);
+                       query.setParameter("name", name.toLowerCase());
                        query.setParameter("deleted", true);
                        List<State> ll = query.getResultList();
                        if (ll.size() > 0) {

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java?rev=1448038&r1=1448037&r2=1448038&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java
 Wed Feb 20 08:35:59 2013
@@ -36,7 +36,7 @@ import javax.persistence.Table;
                        "where c.state_id = :state_id AND c.deleted <> 
:deleted"),
        @NamedQuery(name = "getStates", query = "select c from State as c where 
c.deleted <> :deleted"),
        @NamedQuery(name = "getStateByName", query = "select c from State as c 
" +
-                       "where c.name LIKE :name AND c.deleted <> :deleted")
+                       "where lower(c.name) LIKE :name AND c.deleted <> 
:deleted")
 })
 @Table(name = "state")
 public class State implements Serializable {

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestStateToLower.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestStateToLower.java?rev=1448038&r1=1448037&r2=1448038&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestStateToLower.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestStateToLower.java
 Wed Feb 20 08:35:59 2013
@@ -23,6 +23,7 @@ public class TestStateToLower extends Ab
                assertTrue(state_alabania != null);
                assertTrue(state_alabania_lower != null);
                assertTrue(state_alabania.getState_id().equals(3L));
+               assertTrue(state_alabania_lower.getState_id().equals(3L));
                
assertTrue(state_alabania.getState_id().equals(state_alabania_lower.getState_id()));
                
        }