Alter sync logic to examine new notes as they arrive rather than doing a full reload...

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / threads / CounterRunner.java

diff --git a/src/cx/fbn/nevernote/threads/CounterRunner.java b/src/cx/fbn/nevernote/threads/CounterRunner.java
index 188ceca..6e1b81c 100644 (file)
--- a/src/cx/fbn/nevernote/threads/CounterRunner.java
+++ b/src/cx/fbn/nevernote/threads/CounterRunner.java
@@ -37,7 +37,6 @@ import cx.fbn.nevernote.signals.NotebookSignal;
 import cx.fbn.nevernote.signals.TagSignal;\r
 import cx.fbn.nevernote.signals.TrashSignal;\r
 import cx.fbn.nevernote.sql.DatabaseConnection;\r
-import cx.fbn.nevernote.sql.runners.NoteTagsRecord;\r
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
 import cx.fbn.nevernote.utilities.Pair;\r
 \r
@@ -64,17 +63,21 @@ public class CounterRunner extends QObject implements Runnable {
        \r
        public boolean                                          ready = false;\r
        public boolean                                          abortCount = false;\r
+       private final DatabaseConnection                                        conn;\r
+\r
        private volatile LinkedBlockingQueue<Integer> readyQueue = new LinkedBlockingQueue<Integer>();\r
        \r
        \r
        //*********************************************\r
        //* Constructor                               *\r
        //*********************************************\r
-       public CounterRunner(String logname, int t) {\r
+       public CounterRunner(String logname, int t, String u, String uid, String pswd, String cpswd) {\r
                type = t;\r
+\r
                threadLock = new QMutex();\r
                logger = new ApplicationLogger(logname);\r
 //             setAutoDelete(false);   \r
+               conn = new DatabaseConnection(logger, u, uid, pswd, cpswd);\r
                keepRunning = true;\r
                notebookSignal = new NotebookSignal();\r
                tagSignal = new TagSignal();\r
@@ -116,6 +119,7 @@ public class CounterRunner extends QObject implements Runnable {
                                threadLock.unlock();\r
                        } catch (InterruptedException e) {}\r
                }\r
+               conn.dbShutdown();\r
        }\r
        \r
        \r
@@ -166,7 +170,6 @@ public class CounterRunner extends QObject implements Runnable {
                logger.log(logger.EXTREME, "Entering ListManager.countNotebookResults");                \r
                if (abortCount)\r
                        return;\r
-               DatabaseConnection conn = new DatabaseConnection(logger, Global.tagCounterThreadId);\r
                List<NotebookCounter> nCounter = new ArrayList<NotebookCounter>();\r
                if (abortCount)\r
                        return;\r
@@ -245,7 +248,6 @@ public class CounterRunner extends QObject implements Runnable {
        \r
        private void countTagResults() {\r
                logger.log(logger.EXTREME, "Entering ListManager.countTagResults");             \r
-               DatabaseConnection conn = new DatabaseConnection(logger, Global.tagCounterThreadId);\r
                List<TagCounter> counter = new ArrayList<TagCounter>();\r
                List<Tag> allTags = conn.getTagTable().getAll();\r
                \r
@@ -287,7 +289,7 @@ public class CounterRunner extends QObject implements Runnable {
                \r
                if (abortCount)\r
                        return;\r
-               List<NoteTagsRecord> tags = conn.getNoteTable().noteTagsTable.getAllNoteTags();\r
+               List<cx.fbn.nevernote.sql.NoteTagsRecord> tags = conn.getNoteTable().noteTagsTable.getAllNoteTags();\r
                for (int i=noteIndex.size()-1; i>=0; i--) {\r
                        if (abortCount)\r
                                return;\r
@@ -315,7 +317,6 @@ public class CounterRunner extends QObject implements Runnable {
        \r
        private void countTrashResults() {\r
                logger.log(logger.EXTREME, "Entering CounterRunner.countTrashResults()");               \r
-               DatabaseConnection conn = new DatabaseConnection(logger, Global.trashCounterThreadId);\r
                if (abortCount)\r
                        return;\r
 \r