NixNoteのUpgradeDbメソッドを不要部分を削除。

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / sql / LinkedNotebookTable.java

diff --git a/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java b/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
index 937dca2..fa34e0e 100644 (file)
--- a/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
@@ -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
@@ -151,7 +151,7 @@ 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
@@ -295,7 +295,25 @@ public class LinkedNotebookTable {
                        return query.valueInteger(0);\r
                }       \r
                return 0;\r
-       }                       \r
+       }               \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