diff --git a/src/com/ichi2/anki/Deck.java b/src/com/ichi2/anki/Deck.java index 7d349d9e90..974e3cf34b 100644 --- a/src/com/ichi2/anki/Deck.java +++ b/src/com/ichi2/anki/Deck.java @@ -13,6 +13,12 @@ import android.util.Log; public class Deck { + + /** + * Tag for logging messages + */ + private static String TAG = "Ankidroid"; + // Auto priorities private static final int PRIORITY_HIGH = 4; @@ -183,7 +189,7 @@ public class Deck public static Deck openDeck(String path) throws SQLException { Deck deck = new Deck(); - Log.i("anki", "Opening database " + path); + Log.i(TAG, "openDeck - Opening database " + path); AnkiDb.openDatabase(path); // Read in deck table columns @@ -230,7 +236,7 @@ public class Deck deck.newCount = cursor.getInt(34); deck.revCardOrder = cursor.getInt(35); - Log.i("anki", "Read " + cursor.getColumnCount() + " columns from decks table."); + Log.i(TAG, "openDeck - Read " + cursor.getColumnCount() + " columns from decks table."); cursor.close(); deck.initVars(); @@ -281,7 +287,7 @@ public class Deck private void commitToDB() { - Log.i("anki", "Saving deck to DB..."); + Log.i(TAG, "commitToDB - Saving deck to DB..."); ContentValues values = new ContentValues(); values.put("id", id); values.put("created", created); @@ -345,7 +351,7 @@ public class Deck private void rebuildCounts(boolean full) { - Log.i("anki", "Rebuilding global and due counts..."); + Log.i(TAG, "rebuildCounts - Rebuilding global and due counts..."); // Need to check due first, so new due cards are not added later checkDue(); // Global counts @@ -371,7 +377,7 @@ public class Deck */ private void checkDue() { - Log.i("anki", "Checking due cards..."); + Log.i(TAG, "Checking due cards..."); checkDailyStats(); // Failed cards @@ -407,7 +413,7 @@ public class Deck */ private void rebuildQueue() { - Log.i("anki", "Rebuilding query..."); + Log.i(TAG, "rebuildQueue - Rebuilding query..."); // Setup global/daily stats globalStats = Stats.globalStats(this); dailyStats = Stats.dailyStats(this); @@ -431,7 +437,7 @@ public class Deck } } else newCardModulus = 0; - Log.i("anki", "newCardModulus set to " + newCardModulus); + Log.i(TAG, "newCardModulus set to " + newCardModulus); Cursor cursor = AnkiDb.database.rawQuery("SELECT avg(factor) " + "FROM cards " + "WHERE type = 1", null); if (cursor.isClosed()) @@ -467,7 +473,7 @@ public class Deck private void updatePriorities(int[] cardIds, String[] suspend, boolean dirty) { - Log.i("ank", "Updating priorities..."); + Log.i(TAG, "updatePriorities - Updating priorities..."); // Any tags to suspend if (suspend != null) { @@ -545,7 +551,7 @@ public class Deck private void updateDynamicIndices() { - Log.i("anki", "Updating indices..."); + Log.i(TAG, "updateDynamicIndices - Updating indices..."); HashMap indices = new HashMap(); indices.put("intervalDesc", "(type, isDue, priority desc, interval desc)"); indices.put("intervalAsc", "(type, isDue, priority desc, interval)"); diff --git a/src/com/ichi2/anki/Stats.java b/src/com/ichi2/anki/Stats.java index 915489cf44..cf9e3ca618 100644 --- a/src/com/ichi2/anki/Stats.java +++ b/src/com/ichi2/anki/Stats.java @@ -9,6 +9,12 @@ import android.util.Log; public class Stats { + + /** + * Tag for logging messages + */ + private static String TAG = "Ankidroid"; + private static final int STATS_LIFE = 0; private static final int STATS_DAY = 1; @@ -89,7 +95,7 @@ public class Stats private void fromDB(int id) { - Log.i("anki", "Reading stats from DB..."); + Log.i(TAG, "Reading stats from DB..."); Cursor cursor = AnkiDb.database .rawQuery("SELECT * " + "FROM stats " + "WHERE id = " + String.valueOf(id), null); if (cursor.isClosed()) @@ -125,7 +131,7 @@ public class Stats private void create(int type, Date day) { - Log.i("anki", "Creating new stats for " + day.toString() + "..."); + Log.i(TAG, "Creating new stats for " + day.toString() + "..."); this.type = type; this.day = day; @@ -162,7 +168,7 @@ public class Stats public static Stats globalStats(Deck deck) throws SQLException { - Log.i("anki", "Getting global stats..."); + Log.i(TAG, "Getting global stats..."); int type = STATS_LIFE; Date today = genToday(deck); @@ -186,11 +192,11 @@ public class Stats public static Stats dailyStats(Deck deck) throws SQLException { - Log.i("anki", "Getting daily stats..."); + Log.i(TAG, "Getting daily stats..."); int type = STATS_DAY; Date today = genToday(deck); - Log.i("anki", "Trying to get stats for " + today.toString()); + Log.i(TAG, "Trying to get stats for " + today.toString()); Cursor cursor = AnkiDb.database.rawQuery("SELECT id " + "FROM stats " + "WHERE type = " + String.valueOf(type) + " and day = \"" + today.toString() + "\"", null); if (cursor.isClosed())