Changeset 1103 for contrib/psync/src/main/java/br/com/prognus/psync/items/dao/PIMContactDAO.java

Timestamp:

07/08/09 19:14:32 (15 years ago)

Author:

wmerlotto

Message:

Ticket #554 - Melhorias na sincronizacao de eventos, contatos e adaptacao para Funambol 7.0

File:

• contrib/psync/src/main/java/br/com/prognus/psync/items/dao/PIMContactDAO.java (modified) (3 diffs)

contrib/psync/src/main/java/br/com/prognus/psync/items/dao/PIMContactDAO.java

@@ -68 +68 @@
                         + "WHERE (id_owner = ?) "
                         + "AND ((given_names is null AND (?) = '') "
-                        + "OR (lower(given_names) = ?)) "
+                        + "OR (given_names = ?)) "
                         + "AND ((family_names is null AND (?) = '') "
-                        + "OR (lower(family_names) = ?)) ";
+                        + "OR (family_names = ?)) ";
 
         private static final String SQL_INSERT_INTO_FNBL_PIM_CONTACT = "INSERT INTO phpgw_cc_contact "
@@ -1006 +1006 @@
                         }
 
-                        String fnSearch = (firstName.length() == 0 ? "<N/A>" : firstName
-                                        .toLowerCase());
-                        String lnSearch = (lastName.length() == 0 ? "<N/A>" : lastName
-                                        .toLowerCase());
+                        String fnSearch = (firstName.length() == 0 ? "<N/A>" : firstName);
+                        String lnSearch = (lastName.length() == 0 ? "<N/A>" : lastName);
                         StringBuilder sb = new StringBuilder(100);
 
-                        sb.append("\n\nLooking for items having: ").append(
-                                        "\n> first name   : '").append(fnSearch).append('\'')
-                                        .append("\n> last  name   : '").append(lnSearch).append(
-                                                        '\'').append("\n");
+                        sb.append("\n\nLooking for items having: ")
+                          .append("\n> first name   : '")
+                          .append(fnSearch).append('\'')
+                          .append("\n> last  name   : '")
+                          .append(lnSearch).append('\'').append("\n");
 
                         log.info(sb.toString());
@@ -1022 +1021 @@
                                         + SQL_ORDER_BY_ID);
                         ps.setLong(1, Long.parseLong(userId));
-                        ps.setString(2, firstName.toLowerCase());
-                        ps.setString(3, firstName.toLowerCase());
-                        ps.setString(4, lastName.toLowerCase());
-                        ps.setString(5, lastName.toLowerCase());
+                        ps.setString(2, firstName);
+                        ps.setString(3, firstName);
+                        ps.setString(4, lastName);
+                        ps.setString(5, lastName);
                         rs = ps.executeQuery();