eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

implement support for encoding= option in loadTable()

Browse Source
This commit is contained in:
Ben Fry
2016-05-12 07:41:44 -04:00
parent ad6c6f910a
commit b4e85cbbd3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/processing/data/Table.java
View File

@@ -331,6 +331,7 @@ public class Table {
boolean header = false;
String extension = null;
boolean binary = false;
String encoding = "UTF-8";
String worksheet = null;
final String sheetParam = "worksheet=";
@@ -357,6 +358,8 @@ public class Table {
worksheet = opt.substring(sheetParam.length());
} else if (opt.startsWith("dictionary=")) {
// ignore option, this is only handled by PApplet
} else if (opt.startsWith("encoding=")) {
encoding = opt.substring(9);
} else {
throw new IllegalArgumentException("'" + opt + "' is not a valid option for loading a Table");
}
@@ -374,7 +377,8 @@ public class Table {
odsParse(input, worksheet, header);
} else {
BufferedReader reader = PApplet.createReader(input);
InputStreamReader isr = new InputStreamReader(input, encoding);
BufferedReader reader = new BufferedReader(isr);
if (awfulCSV) {
parseAwfulCSV(reader, header);
} else if ("tsv".equals(extension)) {