Resync Linked & shared notebook tables.

diff --git a/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java b/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
index 722cf4b..937dca2 100644 (file)
--- a/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
@@ -20,10 +20,6 @@
 \r
 package cx.fbn.nevernote.sql;\r
 \r
-<<<<<<< HEAD
-=======
-import java.text.SimpleDateFormat;\r
->>>>>>> Add linked & shared notebook tables
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
@@ -46,25 +42,16 @@ public class LinkedNotebookTable {
        public void createTable() {\r
                NSqlQuery query = new NSqlQuery(db.getConnection());\r
         logger.log(logger.HIGH, "Creating table LinkedNotebook...");\r
-<<<<<<< HEAD
         if (!query.exec("Create table LinkedNotebook (guid VarChar primary key, " +\r
-=======
-        if (!query.exec("Create table LinkedNotebook (id long primary key, " +\r
->>>>>>> Add linked & shared notebook tables
                        "shareName VarChar, " +\r
                        "username VarChar, "+\r
                        "shardID VarChar, " +\r
                        "shareKey VarChar, " +\r
-<<<<<<< HEAD
                        "uri VarChar, " +\r
                        "updateSequenceNumber Long," +\r
                        "lastSequenceNumber Integer," +\r
                        "lastSequenceDate Long," +\r
                        "notebookGuid VarChar," +\r
-=======
-                       "url VarChar, " +\r
-                       "icon blob, " +\r
->>>>>>> Add linked & shared notebook tables
                        "isDirty boolean)"))                            \r
                logger.log(logger.HIGH, "Table LinkedNotebook creation FAILED!!!");   \r
        }\r
@@ -74,7 +61,6 @@ public class LinkedNotebookTable {
                query.exec("Drop table LinkedNotebook");\r
        }\r
        // Save an individual notebook\r
-<<<<<<< HEAD
        public void addNotebook(LinkedNotebook tempNotebook,  boolean isDirty) {\r
                boolean check;\r
                \r
@@ -86,30 +72,13 @@ public class LinkedNotebookTable {
                                +":guid, :shareName, :username, "\r
                                +":shardId, :shareKey, :uri,:usn, :isDirty, 0, 0, :notebookGuid)");\r
                query.bindValue(":guid", tempNotebook.getGuid());\r
-=======
-       public void addNotebook(LinkedNotebook tempNotebook, boolean isDirty) {\r
-               boolean check;\r
-               \r
-               SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");\r
-        NSqlQuery query = new NSqlQuery(db.getConnection());\r
-               check = query.prepare("Insert Into LinkedNotebook (id, shareName, username,  "\r
-                               +"shardId, shareKey, url, isDirty) "   \r
-                               + " Values("\r
-                               +":id, :shareName, :username, "\r
-                               +":shardId, :shareKey, :url, :isDirty)");\r
-               query.bindValue(":id", tempNotebook.getId());\r
->>>>>>> Add linked & shared notebook tables
                query.bindValue(":shareName", tempNotebook.getShareName());\r
                query.bindValue(":username", tempNotebook.getUsername());\r
                query.bindValue(":shardId", tempNotebook.getShardId());\r
                query.bindValue(":shareKey", tempNotebook.getShareKey());\r
-<<<<<<< HEAD
                query.bindValue(":usn", tempNotebook.getUpdateSequenceNum());\r
                query.bindValue(":uri", tempNotebook.getUri());\r
                query.bindValue(":notebookGuid", "");\r
-=======
-               query.bindValue(":url", tempNotebook.getUri());\r
->>>>>>> Add linked & shared notebook tables
                \r
                if (isDirty)\r
                        query.bindValue(":isDirty", true);\r
@@ -120,7 +89,6 @@ public class LinkedNotebookTable {
                if (!check) {\r
                        logger.log(logger.MEDIUM, "LinkedNotebook Table insert failed.");\r
                        logger.log(logger.MEDIUM, query.lastError().toString());\r
-<<<<<<< HEAD
                        return;\r
                }\r
        }\r
@@ -145,40 +113,20 @@ public class LinkedNotebookTable {
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
                check = query.prepare("delete from LinkedNotebook "\r
                                +"where guid=:guid");\r
-=======
-               }\r
-       }\r
-       // Delete the notebook based on a guid\r
-       public void expungeNotebook(long id, boolean needsSync) {\r
-               boolean check;\r
-        NSqlQuery query = new NSqlQuery(db.getConnection());\r
-\r
-               check = query.prepare("delete from LinkedNotebook "\r
-                               +"where id=:id");\r
->>>>>>> Add linked & shared notebook tables
                if (!check) {\r
                        logger.log(logger.EXTREME, "LinkedNotebook SQL delete prepare has failed.");\r
                        logger.log(logger.EXTREME, query.lastError().toString());\r
                }\r
-<<<<<<< HEAD
                query.bindValue(":guid", id);\r
-=======
-               query.bindValue(":id", id);\r
->>>>>>> Add linked & shared notebook tables
                check = query.exec();\r
                if (!check) \r
                        logger.log(logger.MEDIUM, "LinkedNotebook delete failed.");\r
                \r
-<<<<<<< HEAD
-=======
-               // Signal the parent that work needs to be done\r
->>>>>>> Add linked & shared notebook tables
                if  (needsSync) {\r
                        DeletedTable deletedTable = new DeletedTable(logger, db);\r
                        deletedTable.addDeletedItem(new Long(id).toString(), "LinkedNotebook");\r
                }\r
        }\r
-<<<<<<< HEAD
        // Check if a notebook exists\r
        public boolean exists(String id) {\r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
@@ -207,28 +155,12 @@ public class LinkedNotebookTable {
                                "where guid=:keyGuid");\r
                query.bindValue(":guid", tempNotebook.getGuid());\r
                query.bindValue(":keyGuid", tempNotebook.getGuid());\r
-=======
-       // Update a notebook\r
-       public void updateNotebook(LinkedNotebook tempNotebook, boolean isDirty) {\r
-               boolean check;\r
-               \r
-               SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");\r
-               \r
-        NSqlQuery query = new NSqlQuery(db.getConnection());\r
-               check = query.prepare("Update LinkedNotebook set id=:id, shareName=:shareName, " +\r
-                               "username=:username, shardID=:shardID, shareKey=:shareKey, url=:url, isDirty=:isDirty");\r
-               query.bindValue(":id", tempNotebook.getId());\r
->>>>>>> Add linked & shared notebook tables
                query.bindValue(":shareName", tempNotebook.getShareName());\r
                query.bindValue(":username", tempNotebook.getUsername());\r
                query.bindValue(":shardID", tempNotebook.getShardId());\r
                query.bindValue(":shareKey", tempNotebook.getShareKey());\r
-<<<<<<< HEAD
                query.bindValue(":uri", tempNotebook.getUri());\r
                query.bindValue(":usn", tempNotebook.getUpdateSequenceNum());\r
-=======
-               query.bindValue(":url", tempNotebook.getUri());\r
->>>>>>> Add linked & shared notebook tables
 \r
                query.bindValue(":isDirty", isDirty);\r
                \r
@@ -246,36 +178,23 @@ public class LinkedNotebookTable {
                                        \r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
                                        \r
-<<<<<<< HEAD
                check = query.exec("Select guid, shareName, username, shardID, shareKey, uri " +\r
-=======
-               check = query.exec("Select id, shareName, username, shardID, shareKey url, " +\r
->>>>>>> Add linked & shared notebook tables
                                " from LinkedNotebook");\r
                if (!check)\r
                        logger.log(logger.EXTREME, "Notebook SQL retrieve has failed.");\r
                while (query.next()) {\r
                        tempNotebook = new LinkedNotebook();\r
-<<<<<<< HEAD
                        tempNotebook.setGuid(query.valueString(0));\r
                        tempNotebook.setShareName(query.valueString(1));\r
                        tempNotebook.setUsername(query.valueString(2));\r
                        tempNotebook.setShardId(query.valueString(3));\r
                        tempNotebook.setShareKey(query.valueString(4));\r
                        tempNotebook.setUri(query.valueString(5));\r
-=======
-                       tempNotebook.setId(query.valueLong(0));\r
-                       tempNotebook.setUsername(query.valueString(1));\r
-                       tempNotebook.setShardId(query.valueString(2));\r
-                       tempNotebook.setShareKey(query.valueString(3));\r
-                       tempNotebook.setUri(query.valueString(4));\r
->>>>>>> Add linked & shared notebook tables
 \r
                        index.add(tempNotebook); \r
                }       \r
                return index;\r
        }                       \r
-<<<<<<< HEAD
        // Load notebooks from the database\r
        public LinkedNotebook getNotebook(String guid) {\r
                LinkedNotebook tempNotebook;\r
@@ -377,8 +296,6 @@ public class LinkedNotebookTable {
                }       \r
                return 0;\r
        }                       \r
-=======
->>>>>>> Add linked & shared notebook tables
 \r
        // does a record exist?\r
        public String findNotebookByShareName(String name) {\r
@@ -395,7 +312,6 @@ public class LinkedNotebookTable {
                return val;\r
        }\r
 \r
-<<<<<<< HEAD
        // does a record exist?\r
        public String setNotebookGuid(String shareKey, String notebookGuid) {\r
                \r
@@ -456,8 +372,6 @@ public class LinkedNotebookTable {
                }       \r
                return index;   \r
        }\r
-=======
->>>>>>> Add linked & shared notebook tables
 \r
 }\r
 \r

diff --git a/src/cx/fbn/nevernote/sql/SharedNotebookTable.java b/src/cx/fbn/nevernote/sql/SharedNotebookTable.java
index 755c73e..d14e34d 100644 (file)
--- a/src/cx/fbn/nevernote/sql/SharedNotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/SharedNotebookTable.java
@@ -70,19 +70,11 @@ public class SharedNotebookTable {
                SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");\r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
                check = query.prepare("Insert Into SharedNotebook (id, userid, notebookGuid, email,  "\r
-<<<<<<< HEAD
                                +"notebookModifiable, requireLogin, serviceCreated, shareKey, username, isDirty) "   \r
                                + " Values("\r
                                +":id, :userid, :notebookGuid, :email, "\r
                                +":notebookModifiable, :requireLogin, :serviceCreated, "\r
                                +":shareKey, :username, :isDirty)");\r
-=======
-                               +"notebookModifiable, requireLogin, serviceCreated, shareKey, username) "   \r
-                               + " Values("\r
-                               +":id, :userid, :notebookGuid, :email, "\r
-                               +":notebookModifiable, :requireLogin, :serviceCreated, "\r
-                               +":shareKey, :username)");\r
->>>>>>> Add linked & shared notebook tables
                query.bindValue(":id", tempNotebook.getId());\r
                query.bindValue(":userid", tempNotebook.getUserId());\r
                query.bindValue(":notebookGuid", tempNotebook.getNotebookGuid());\r
@@ -107,7 +99,6 @@ public class SharedNotebookTable {
                        logger.log(logger.MEDIUM, query.lastError().toString());\r
                }\r
        }\r
-<<<<<<< HEAD
        // Check if a notebook exists\r
        public boolean exists(long id) {\r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
@@ -123,9 +114,6 @@ public class SharedNotebookTable {
                return false;\r
        }\r
        // Delete the notebook based on a id\r
-=======
-       // Delete the notebook based on a guid\r
->>>>>>> Add linked & shared notebook tables
        public void expungeNotebook(long id, boolean needsSync) {\r
                boolean check;\r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
@@ -147,7 +135,6 @@ public class SharedNotebookTable {
                        deletedTable.addDeletedItem(new Long(id).toString(), "SharedNotebook");\r
                }\r
        }\r
-<<<<<<< HEAD
        // Delete the notebook based on a id\r
        public void expungeNotebookByGuid(String id, boolean needsSync) {\r
                boolean check;\r
@@ -186,17 +173,6 @@ public class SharedNotebookTable {
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
                check = query.prepare("Update SharedNotebook set id=:id, userid=:userid, notebookGuid=:notebook, "\r
                                + "email=:email, notebookModifiable=:mod, requireLogin=:rlogin, serviceCreated=:serviceCreated, "\r
-=======
-       // Update a notebook\r
-       public void updateNotebook(SharedNotebook tempNotebook, boolean isDirty) {\r
-               boolean check;\r
-               \r
-               SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");\r
-               \r
-        NSqlQuery query = new NSqlQuery(db.getConnection());\r
-               check = query.prepare("Update SharedNotebook set id=:id, userid=:userid, notebookGuid=:notebook, "\r
-                               + "email=:email, notebookModifiable=:mod, requireLogin=:rlogin, serviceCreated=:created "\r
->>>>>>> Add linked & shared notebook tables
                                + "shareKey=:shareKey, username=:username, isDirty=:isdirty");\r
                query.bindValue(":id", tempNotebook.getId());\r
                query.bindValue(":userid", tempNotebook.getUserId());\r
@@ -204,17 +180,9 @@ public class SharedNotebookTable {
                query.bindValue(":email", tempNotebook.getEmail());\r
                query.bindValue(":mod", tempNotebook.isNotebookModifiable());\r
                query.bindValue(":rlogin", tempNotebook.isRequireLogin());\r
-<<<<<<< HEAD
                query.bindValue(":serviceCreated", serviceCreated.toString());\r
                query.bindValue(":shareKey", tempNotebook.getShareKey());\r
                query.bindValue(":username", tempNotebook.getUsername());\r
-=======
-               query.bindValue(":shareKey", tempNotebook.getShareKey());\r
-               query.bindValue(":username", tempNotebook.getUsername());\r
-\r
-               StringBuilder serviceCreated = new StringBuilder(simple.format(tempNotebook.getServiceCreated()));                                              \r
-               query.bindValue(":serviceCreated", serviceCreated.toString());\r
->>>>>>> Add linked & shared notebook tables
                \r
                query.bindValue(":isDirty", isDirty);\r
                \r
@@ -262,7 +230,6 @@ public class SharedNotebookTable {
                return index;\r
        }                       \r
 \r
-<<<<<<< HEAD
        // Load notebooks from the database\r
        public List<SharedNotebook> getForNotebook(String guid) {\r
                SharedNotebook tempNotebook;\r
@@ -322,23 +289,5 @@ public class SharedNotebookTable {
                return index;   \r
        }\r
 \r
-=======
-       // does a record exist?\r
-       public String findNotebookByName(String newname) {\r
-               \r
-               NSqlQuery query = new NSqlQuery(db.getConnection());\r
-               \r
-               query.prepare("Select guid from sharednotebook where name=:newname");\r
-               query.bindValue(":newname", newname);\r
-               if (!query.exec())\r
-                       logger.log(logger.EXTREME, "notebook SQL retrieve has failed.");\r
-               String val = null;\r
-               if (query.next())\r
-                       val = query.valueString(0);\r
-               return val;\r
-       }\r
-\r
-\r
->>>>>>> Add linked & shared notebook tables
 }\r
 \r