From 558f0451aff1b1adb7876cf53a5debe7ae354885 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Sun, 19 Feb 2017 20:48:17 +0100
Subject: [PATCH] Revert "src: Disabled bookmarking for upcoming release"

This reverts commit 356c753f13c26fe11d324af35a611d8bc691c069.
---
 src/lib/component/ComponentManager.cpp |   4 +-
 src/lib/data/SqliteStorage.cpp         | 120 ++++++++++++-------------
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/lib/component/ComponentManager.cpp b/src/lib/component/ComponentManager.cpp
index 4b9b09e6..dbfc9183 100644
--- a/src/lib/component/ComponentManager.cpp
+++ b/src/lib/component/ComponentManager.cpp
@@ -33,8 +33,8 @@ void ComponentManager::setup(ViewLayout* viewLayout)
 		m_componentFactory->getViewFactory()->createCompositeView(viewLayout, CompositeView::DIRECTION_HORIZONTAL, "Search");
 	m_compositeViews.push_back(compositeView);
 
-	// std::shared_ptr<Component> bookmarkComponent = m_componentFactory->createBookmarkComponent(compositeView.get());
-	// m_components.push_back(bookmarkComponent);
+	std::shared_ptr<Component> bookmarkComponent = m_componentFactory->createBookmarkComponent(compositeView.get());
+	m_components.push_back(bookmarkComponent);
 
 	std::shared_ptr<Component> undoRedoComponent = m_componentFactory->createUndoRedoComponent(compositeView.get());
 	m_components.push_back(undoRedoComponent);
diff --git a/src/lib/data/SqliteStorage.cpp b/src/lib/data/SqliteStorage.cpp
index 3d97ab3a..a0e38315 100644
--- a/src/lib/data/SqliteStorage.cpp
+++ b/src/lib/data/SqliteStorage.cpp
@@ -1361,72 +1361,72 @@ void SqliteStorage::setupTables()
 				"PRIMARY KEY(id));"
 		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS bookmarkCategory("
-		// 	"id INTEGER NOT NULL, "
-		// 	"name TEXT, "
-		// 	"PRIMARY KEY(id));"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS bookmarkCategory("
+			"id INTEGER NOT NULL, "
+			"name TEXT, "
+			"PRIMARY KEY(id));"
+		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS nodeBookmark("
-		// 	"id INTEGER NOT NULL, "
-		// 	"name TEXT, "
-		// 	"comment TEXT, "
-		// 	"timestamp TEXT, "
-		// 	"category INTEGER, "
-		// 	"PRIMARY KEY(id), "
-		// 	"FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS nodeBookmark("
+			"id INTEGER NOT NULL, "
+			"name TEXT, "
+			"comment TEXT, "
+			"timestamp TEXT, "
+			"category INTEGER, "
+			"PRIMARY KEY(id), "
+			"FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
+		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS edgeBookmark("
-		// 	"id INTEGER NOT NULL, "
-		// 	"name TEXT, "
-		// 	"comment TEXT, "
-		// 	"timestamp TEXT, "
-		// 	"category INTEGER, "
-		// 	"PRIMARY KEY(id), "
-		// 	"FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS edgeBookmark("
+			"id INTEGER NOT NULL, "
+			"name TEXT, "
+			"comment TEXT, "
+			"timestamp TEXT, "
+			"category INTEGER, "
+			"PRIMARY KEY(id), "
+			"FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
+		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS nodeBookmarkToken("
-		// 	"id INTEGER NOT NULL, "
-		// 	"bookmarkId INTEGER NOT NULL, "
-		// 	"name TEXT, "
-		// 	"type INTEGER, "
-		// 	"PRIMARY KEY(id), "
-		// 	"FOREIGN KEY(bookmarkId) REFERENCES nodeBookmark(id) ON DELETE CASCADE);"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS nodeBookmarkToken("
+			"id INTEGER NOT NULL, "
+			"bookmarkId INTEGER NOT NULL, "
+			"name TEXT, "
+			"type INTEGER, "
+			"PRIMARY KEY(id), "
+			"FOREIGN KEY(bookmarkId) REFERENCES nodeBookmark(id) ON DELETE CASCADE);"
+		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS edgeBookmarkToken("
-		// 	"id INTEGER NOT NULL, "
-		// 	"bookmarkId INTEGER NOT NULL, "
-		// 	"name TEXT, "
-		// 	"type INTEGER, "
-		// 	"PRIMARY KEY(id), "
-		// 	"FOREIGN KEY(bookmarkId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS edgeBookmarkToken("
+			"id INTEGER NOT NULL, "
+			"bookmarkId INTEGER NOT NULL, "
+			"name TEXT, "
+			"type INTEGER, "
+			"PRIMARY KEY(id), "
+			"FOREIGN KEY(bookmarkId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
+		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS edgeBaseBookmark("
-		// 	"id INTEGER NOT NULL, "
-		// 	"edgeId INTEGER, "
-		// 	"PRIMARY KEY(id), "
-		// 	"FOREIGN KEY(edgeId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS edgeBaseBookmark("
+			"id INTEGER NOT NULL, "
+			"edgeId INTEGER, "
+			"PRIMARY KEY(id), "
+			"FOREIGN KEY(edgeId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
+		);
 
-		// m_database.execDML(
-		// 	"CREATE TABLE IF NOT EXISTS edgeBaseBookmarkToken("
-		// 	"id INTEGER NOT NULL, "
-		// 	"bookmarkId INTEGER NOT NULL, "
-		// 	"name TEXT, "
-		// 	"type INTEGER, "
-		// 	"PRIMARY KEY(id), "
-		// 	"FOREIGN KEY(bookmarkId) REFERENCES edgeBaseBookmark(id) ON DELETE CASCADE);"
-		// );
+		m_database.execDML(
+			"CREATE TABLE IF NOT EXISTS edgeBaseBookmarkToken("
+			"id INTEGER NOT NULL, "
+			"bookmarkId INTEGER NOT NULL, "
+			"name TEXT, "
+			"type INTEGER, "
+			"PRIMARY KEY(id), "
+			"FOREIGN KEY(bookmarkId) REFERENCES edgeBaseBookmark(id) ON DELETE CASCADE);"
+		);
 	}
 	catch (CppSQLite3Exception& e)
 	{