OSDN Git Service

Correct LaTeX images. Upgrade to 0.99
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / sql / NoteTable.java
index c25d125..5ccfb8f 100644 (file)
@@ -68,8 +68,8 @@ public class NoteTable {
        }\r
        // Create the table\r
        public void createTable() {\r
-               getQueryWithContent = new NSqlQuery(db.getConnection());\r
-               getQueryWithoutContent = new NSqlQuery(db.getConnection());\r
+               //getQueryWithContent = new NSqlQuery(db.getConnection());\r
+               //getQueryWithoutContent = new NSqlQuery(db.getConnection());\r
                NSqlQuery query = new NSqlQuery(db.getConnection());\r
         logger.log(logger.HIGH, "Creating table Note...");\r
         if (!query.exec("Create table Note (guid varchar primary key, " +\r
@@ -164,45 +164,49 @@ public class NoteTable {
                        for (int i=0; i<n.getTagGuids().size(); i++) \r
                                noteTagsTable.saveNoteTag(n.getGuid(), n.getTagGuids().get(i));\r
                }\r
-               \r
                logger.log(logger.EXTREME, "Leaving addNote");\r
        } \r
        // Setup queries for get to save time later\r
        private void prepareQueries() {\r
-               if (getQueryWithContent != null)\r
-                       return;\r
-               getQueryWithContent = new NSqlQuery(db.getConnection());\r
-               getQueryWithoutContent = new NSqlQuery(db.getConnection());\r
-               getAllQueryWithoutContent = new NSqlQuery(db.getConnection());\r
-               \r
-               if (!getQueryWithContent.prepare("Select "\r
-                               +"guid, updateSequenceNumber, title, "\r
-                               +"created, updated, deleted, active, notebookGuid, "\r
-                               +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, "\r
-                               +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication, "\r
-                               +"content, contentHash, contentLength"\r
-                               +" from Note where guid=:guid and isExpunged=false")) {\r
-                                       logger.log(logger.EXTREME, "Note SQL select prepare with content has failed.");\r
-                                       logger.log(logger.MEDIUM, getQueryWithContent.lastError());\r
+               if (getQueryWithContent == null) {\r
+                       getQueryWithContent = new NSqlQuery(db.getConnection());\r
+                       if (!getQueryWithContent.prepare("Select "\r
+                                       +"guid, updateSequenceNumber, title, "\r
+                                       +"created, updated, deleted, active, notebookGuid, "\r
+                                       +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, "\r
+                                       +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication, "\r
+                                       +"content, contentHash, contentLength"\r
+                                       +" from Note where guid=:guid and isExpunged=false")) {\r
+                                               logger.log(logger.EXTREME, "Note SQL select prepare with content has failed.");\r
+                                               logger.log(logger.MEDIUM, getQueryWithContent.lastError());\r
+                       }\r
                }\r
                \r
-               if (!getQueryWithoutContent.prepare("Select "\r
-                               +"guid, updateSequenceNumber, title, "\r
-                               +"created, updated, deleted, active, notebookGuid, "\r
-                               +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, "\r
-                               +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication "\r
-                               +" from Note where guid=:guid and isExpunged=false")) {\r
-                                       logger.log(logger.EXTREME, "Note SQL select prepare without content has failed.");\r
-                                       logger.log(logger.MEDIUM, getQueryWithoutContent.lastError());\r
+               if (getQueryWithoutContent == null) {\r
+                       getQueryWithoutContent = new NSqlQuery(db.getConnection());\r
+                       if (!getQueryWithoutContent.prepare("Select "\r
+                                       +"guid, updateSequenceNumber, title, "\r
+                                       +"created, updated, deleted, active, notebookGuid, "\r
+                                       +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, "\r
+                                       +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication "\r
+                                       +" from Note where guid=:guid and isExpunged=false")) {\r
+                                               logger.log(logger.EXTREME, "Note SQL select prepare without content has failed.");\r
+                                               logger.log(logger.MEDIUM, getQueryWithoutContent.lastError());\r
+                       }\r
                }\r
-               if (!getAllQueryWithoutContent.prepare("Select "\r
+                       \r
+               if (getAllQueryWithoutContent == null) {\r
+                       getAllQueryWithoutContent = new NSqlQuery(db.getConnection());\r
+               \r
+                       if (!getAllQueryWithoutContent.prepare("Select "\r
                                +"guid, updateSequenceNumber, title, "\r
                                +"created, updated, deleted, active, notebookGuid, "\r
                                +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, "\r
                                +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication "\r
                                +" from Note where isExpunged = false")) {\r
-                                       logger.log(logger.EXTREME, "Note SQL select prepare without content has failed.");\r
+                               logger.log(logger.EXTREME, "Note SQL select prepare without content has failed.");\r
                                        logger.log(logger.MEDIUM, getQueryWithoutContent.lastError());\r
+                       }\r
                }\r
        }\r
 \r
@@ -311,9 +315,17 @@ public class NoteTable {
                        codec = QTextCodec.codecForName("UTF-8");\r
                String unicode =  codec.fromUnicode(query.valueString(16)).toString();\r
 \r
-               if (Global.enableHTMLEntitiesFix)\r
-                       unicode = codec.fromUnicode(StringEscapeUtils.unescapeXml(query.valueString(16).toString())).toString();\r
-               \r
+               // This is a hack.  Basically I need to convert HTML Entities to "normal" text, but if I\r
+               // convert the &lt; character to < it will mess up the XML parsing.  So, to get around this\r
+               // I am "bit stuffing" the &lt; to &&lt; so StringEscapeUtils doesn't unescape it.  After\r
+               // I'm done I convert it back.\r
+               if (Global.enableHTMLEntitiesFix && unicode.indexOf("&#") > 0) {\r
+                       unicode = query.valueString(16);\r
+                       unicode = unicode.replace("&lt;", "&_lt;");\r
+                       unicode = codec.fromUnicode(StringEscapeUtils.unescapeHtml(unicode)).toString();\r
+                       unicode = unicode.replace("&_lt;", "&lt;");\r
+               }\r
+                       \r
                n.setContent(unicode);\r
 //                     n.setContent(query.valueString(16).toString());\r
                        \r
@@ -921,7 +933,9 @@ public class NoteTable {
        public List<Note> getAllNotes() {\r
                List<Note> notes = new ArrayList<Note>();\r
                prepareQueries();\r
-               boolean check;                                  \r
+               boolean check;  \r
+               if (getAllQueryWithoutContent == null) \r
+                       prepareQueries();\r
         NSqlQuery query = getAllQueryWithoutContent;\r
                check = query.exec();\r
                if (!check)\r
@@ -1388,4 +1402,9 @@ public class NoteTable {
                        position = n.getContent().indexOf("<en-media", position+1);\r
                }\r
        }\r
+\r
 }      \r
+\r
+\r
+\r
+\r