work on wrapping up XML changes

This commit is contained in:
benfry
2012-12-16 19:31:09 +00:00
parent 8c69aeac16
commit c31c40000e
10 changed files with 227 additions and 113 deletions

View File

@@ -43,9 +43,10 @@ public class TableODS extends Table {
*/
protected TableODS(InputStream input, String worksheet, boolean actual) {
try {
InputStreamReader isr = new InputStreamReader(input, "UTF-8");
BufferedReader reader = new BufferedReader(isr);
read(reader, worksheet, actual);
// InputStreamReader isr = new InputStreamReader(input, "UTF-8");
// BufferedReader reader = new BufferedReader(isr);
// read(reader, worksheet, actual);
read(input, worksheet, actual);
} catch (UnsupportedEncodingException uee) {
uee.printStackTrace();
@@ -59,8 +60,11 @@ public class TableODS extends Table {
}
protected void read(BufferedReader reader, String worksheet, boolean actual) throws IOException, ParserConfigurationException, SAXException {
XML xml = new XML(reader);
// protected void read(BufferedReader reader, String worksheet, boolean actual) throws IOException, ParserConfigurationException, SAXException {
// XML xml = new XML(reader);
protected void read(InputStream input, String worksheet, boolean actual) throws IOException, ParserConfigurationException, SAXException {
XML xml = new XML(input);
// XML x = new XML(reader);
// PApplet.saveStrings(new File("/Users/fry/Desktop/namespacefix.xml"), new String[] { xml.toString() });
// PApplet.saveStrings(new File("/Users/fry/Desktop/newparser.xml"), new String[] { x.toString() });