s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default the encoding of clipboard data to UTF-8.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2390 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2011-11-29 05:21:26 +00:00
parent 07ba5cf27b
commit 76802d328d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/com/google/refine/importing/ImportingUtilities.java
View File

@ -224,11 +224,16 @@ public class ImportingUtilities {
String name = fileItem.getFieldName().toLowerCase(); String name = fileItem.getFieldName().toLowerCase();
if (fileItem.isFormField()) { if (fileItem.isFormField()) {
if (name.equals("clipboard")) { if (name.equals("clipboard")) {
String encoding = request.getCharacterEncoding();
if (encoding == null) {
encoding = "UTF-8";
}
File file = allocateFile(rawDataDir, "clipboard.txt"); File file = allocateFile(rawDataDir, "clipboard.txt");
JSONObject fileRecord = new JSONObject(); JSONObject fileRecord = new JSONObject();
JSONUtilities.safePut(fileRecord, "origin", "clipboard"); JSONUtilities.safePut(fileRecord, "origin", "clipboard");
JSONUtilities.safePut(fileRecord, "declaredEncoding", request.getCharacterEncoding()); JSONUtilities.safePut(fileRecord, "declaredEncoding", encoding);
JSONUtilities.safePut(fileRecord, "declaredMimeType", (String) null); JSONUtilities.safePut(fileRecord, "declaredMimeType", (String) null);
JSONUtilities.safePut(fileRecord, "format", "text"); JSONUtilities.safePut(fileRecord, "format", "text");
JSONUtilities.safePut(fileRecord, "fileName", "(clipboard)"); JSONUtilities.safePut(fileRecord, "fileName", "(clipboard)");