From 691043868e93201f8315d90b0f8c351f0ee4edd0 Mon Sep 17 00:00:00 2001 From: Randy Baumgarte Date: Mon, 15 Aug 2011 10:37:25 -0400 Subject: [PATCH] Try to correct a problem when saving a note where unprintable characters would be inserted when saving. --- src/cx/fbn/nevernote/evernote/EnmlConverter.java | 1 + src/cx/fbn/nevernote/sql/NoteTable.java | 7 ++++--- src/cx/fbn/nevernote/xml/XMLCleanup.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cx/fbn/nevernote/evernote/EnmlConverter.java b/src/cx/fbn/nevernote/evernote/EnmlConverter.java index 36e8129..6e0311b 100644 --- a/src/cx/fbn/nevernote/evernote/EnmlConverter.java +++ b/src/cx/fbn/nevernote/evernote/EnmlConverter.java @@ -141,6 +141,7 @@ public class EnmlConverter { tidy.setMessageListener(tidyListener); tidy.getStderr().close(); // the listener will capture messages tidy.setXmlTags(true); + tidy.setXHTML(true); QTextCodec codec; codec = QTextCodec.codecForName("UTF-8"); diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java index 477a794..c1725df 100644 --- a/src/cx/fbn/nevernote/sql/NoteTable.java +++ b/src/cx/fbn/nevernote/sql/NoteTable.java @@ -534,9 +534,10 @@ public class NoteTable { logger.log(logger.MEDIUM, query.lastError()); } - QTextCodec codec = QTextCodec.codecForLocale(); - codec = QTextCodec.codecForName("UTF-8"); - query.bindValue(":content", codec.fromUnicode(content).toString()); +// QTextCodec codec = QTextCodec.codecForLocale(); +// codec = QTextCodec.codecForName("UTF-8"); +// query.bindValue(":content", codec.fromUnicode(content).toString()); + query.bindValue(":content", content); query.bindValue(":guid", guid); check = query.exec(); diff --git a/src/cx/fbn/nevernote/xml/XMLCleanup.java b/src/cx/fbn/nevernote/xml/XMLCleanup.java index 159381d..29584f0 100644 --- a/src/cx/fbn/nevernote/xml/XMLCleanup.java +++ b/src/cx/fbn/nevernote/xml/XMLCleanup.java @@ -128,7 +128,8 @@ public class XMLCleanup { element.setTagName("span"); } } - content = doc.toString(); + // Replace the XML carrage returns that the toString() creates. + content = doc.toString().replace( " ", "" ); } // Start looking through the tree. -- 2.11.0