Changeset 315 for tools

Timestamp:

05/01/09 09:54:36 (10 months ago)

Author:

anton

Message:

Response character encoding fixed

Location:

tools/routingservice/branches/wrs-2.0/src

Files:

• WRS.java (modified) (3 diffs)
• handler/DatabaseHandler.java (modified) (3 diffs)

tools/routingservice/branches/wrs-2.0/src/WRS.java

@@ -65 +65 @@
 import util.Sref;
 
+import org.restlet.data.CharacterSet;
 import org.restlet.data.Form;
 import org.restlet.data.MediaType;
@@ -154 +155 @@
                         System.exit(0);
                 }
+                
+                System.out.println(System.getProperty("file.encoding"));
 
                 log = new Log(this.conf.getLog().getUrl(), this.conf.getLog()
@@ -245 +248 @@
                                         response.setEntity(result, MIMETypes.valueOf(
                                                         templateType.toUpperCase()).getType());
+                                        //Magical thing you need to do to set a proper encoding
+                                        response.getEntity().setCharacterSet(CharacterSet.valueOf("UTF-8")); 
                                 }
                                 catch (InvalidVersionException e)

tools/routingservice/branches/wrs-2.0/src/handler/DatabaseHandler.java

@@ -20 +20 @@
 import geometry.Point;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -142 +143 @@
                                                         op.setType(request.getService().getOut().get(key)
                                                                         .getType());
-                                                        op.setValue(result.getString(key));
+                                                        //op.setValue(result.getString(key));
+                                                        op.setValue(new String(result.getBytes(key), "UTF-8"));
 
                                                         paraMap.put(key, op);
@@ -148 +150 @@
                                                 out.add(paraMap);
                                         }
+                                        stmt.close();
                                 }
                                 catch (SQLException e)
+                                {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+                                catch (UnsupportedEncodingException e)
                                 {
                                         // TODO Auto-generated catch block