OSDN Git Service

NixNoteのUpgradeDbメソッドを不要部分を削除。
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / sql / LinkedNotebookTable.java
index 722cf4b..fa34e0e 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * This file is part of NeverNote \r
+ * This file is part of NixNote/NeighborNote \r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
 \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
@@ -203,32 +151,16 @@ public class LinkedNotebookTable {
                \r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
                check = query.prepare("Update LinkedNotebook set guid=:guid, shareName=:shareName, " +\r
-                               "username=:username, shardID=:shardID, shareKey=:shareKey, uri=:uri, updateSequenceNumber=:usn, isDirty=:isDirty "+\r
+                               "username=:username, shardID=:shardID, uri=:uri, updateSequenceNumber=:usn, isDirty=:isDirty "+\r
                                "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
@@ -376,9 +295,25 @@ public class LinkedNotebookTable {
                        return query.valueInteger(0);\r
                }       \r
                return 0;\r
-       }                       \r
-=======
->>>>>>> Add linked & shared notebook tables
+       }               \r
+       \r
+       // get the "true" notebook guid and not the shared notebook guid\r
+       public String getLocalNotebookGuid(String guid) {\r
+               boolean check;\r
+                                       \r
+        NSqlQuery query = new NSqlQuery(db.getConnection());\r
+                                       \r
+               check = query.prepare("Select notebookGuid " \r
+                               +"from LinkedNotebook where guid=:guid");\r
+               query.bindValue(":guid", guid);\r
+               check = query.exec();\r
+               if (!check)\r
+                       logger.log(logger.EXTREME, "Notebook SQL retrieve has failed.");\r
+               while (query.next()) {\r
+                       return query.valueString(0);\r
+               }       \r
+               return null;\r
+       }\r
 \r
        // does a record exist?\r
        public String findNotebookByShareName(String name) {\r
@@ -395,7 +330,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 +390,6 @@ public class LinkedNotebookTable {
                }       \r
                return index;   \r
        }\r
-=======
->>>>>>> Add linked & shared notebook tables
 \r
 }\r
 \r