Reverted changes in Globalization from revision r5182. Parameter encoding is in Native SQL Lists is now handled by the classes itself, without using Globalization.

git-svn-id: https://svn.libreccm.org/ccm/trunk@5189 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/com/arsdigita/globalization/Globalization.java

@@ -55,13 +55,13 @@ public class Globalization {
      * The default encoding for parameterts, as specified by the
      * servlet spec
      */
-    public static final String DEFAULT_PARAM_ENCODING = "UTF-8";
+    public static final String DEFAULT_PARAM_ENCODING = "ISO-8859-1";
 
     /**
      * The default encoding for request/response body data, as specified by the
      * servlet spec
      */
-    public static final String DEFAULT_ENCODING = "UTF-8";
+    public static final String DEFAULT_ENCODING = "ISO-8859-1";
 
     private static Map s_localeToCharsetMap;
     

ccm-sci-member-navigation/src/com/arsdigita/cms/scimember/navigation/SciMemberList.java

@@ -7,6 +7,7 @@ import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -113,8 +114,19 @@ public class SciMemberList extends AbstractComponent {
 
 //            final String surnameFilter = request.getParameter("surname");
 //            final String 
-            surnameFilter = Globalization.decodeParameter(request,
+//            surnameFilter = Globalization.decodeParameter(request,
-                                                          "surname");
+//                                                          "surname");
+            if (request.getParameter("surname") == null) {
+                surnameFilter = null;
+            } else {
+                try {
+                    surnameFilter = new String(request
+                        .getParameter("surname")
+                        .getBytes("UTF-8"));
+                } catch (UnsupportedEncodingException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            }
 
             if (surnameFilter != null && !surnameFilter.trim().isEmpty()) {
                 whereBuffer

ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java

@@ -1,6 +1,5 @@
 package com.arsdigita.cms.sciproject.navigation;
 
-import com.arsdigita.globalization.Globalization;
 import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.navigation.Navigation;
 import com.arsdigita.navigation.ui.AbstractComponent;
@@ -8,6 +7,7 @@ import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -103,8 +103,19 @@ public class SciProjectList extends AbstractComponent {
         final BigDecimal researchFieldFilter;
         try {
 //            final String titleFilter = request.getParameter("title");
-            titleFilter = Globalization.decodeParameter(request,
+//            titleFilter = Globalization.decodeParameter(request,
-                                                        "title");
+//                                                        "title");
+            if (request.getParameter("title") == null) {
+                titleFilter = null;
+            } else {
+                try {
+                    titleFilter = new String(request
+                        .getParameter("title")
+                        .getBytes("UTF-8"));
+                } catch (UnsupportedEncodingException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            }
 //            final BigDecimal categoryFilter;
             if (request.getParameter("researchfield") == null
                     || request.getParameter("researchfield").isEmpty()) {

ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java

@@ -18,6 +18,7 @@ import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -305,8 +306,19 @@ public class PublicationList extends AbstractComponent {
         final String orderByParam;
         try {
 //            final String 
-            titleFilter = Globalization.decodeParameter(request,
+//            titleFilter = Globalization.decodeParameter(request,
-                                                        "title");
+//                                                        "title");
+            if (request.getParameter("title") == null) {
+                titleFilter = null;
+            } else {
+                try {
+                    titleFilter = new String(request
+                        .getParameter("title")
+                        .getBytes("UTF-8"));
+                } catch (UnsupportedEncodingException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            }
 //            final String titleFilter = request.getParameter("title");
 //            final Integer yearFilter;
             if (request.getParameter("yearOfPublication") == null) {
@@ -319,7 +331,19 @@ public class PublicationList extends AbstractComponent {
             }
 //            final String 
 //            authorsFilter = request.getParameter("authorsStr");
-            authorsFilter = Globalization.decodeParameter(request, "authorsStr");
+//            authorsFilter = Globalization.decodeParameter(request, "authorsStr");
+            if (request.getParameter("authorsStr") == null) {
+                authorsFilter = null;
+            } else {
+                try {
+                    authorsFilter = new String(request
+                        .getParameter("authorsStr")
+                        .getBytes("UTF-8"));
+                } catch (UnsupportedEncodingException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            }
+
             if ((titleFilter != null && !titleFilter.trim().isEmpty())
                     || yearFilter != null
                     || (authorsFilter != null && !authorsFilter.trim().isEmpty())) {