fix bad path management

3 files changed, 7 insertions, 3 deletions

diff --git a/lib/server/flask/_app.py b/lib/server/flask/_app.py
index f4b8096..995c532 100644
--- a/lib/server/flask/_app.py
+++ b/lib/server/flask/_app.py
@@ -24,8 +24,9 @@ try:
     BUNDLE = activity.get_bundle_path()
     ROOT   = activity.get_activity_root()
 except Exception, e:
-    BUNDLE = '.'
-    ROOT   = '.'
+    BUNDLE = os.path.abspath(os.path.join(
+                os.path.dirname(__file__), '..', '..', '..'))
+    ROOT   = BUNDLE
 
 # init app
 app = flask.Flask(__name__)
diff --git a/nutrinoweb/controllers/database_manager.py b/nutrinoweb/controllers/database_manager.py
index 6d0a2ca..5213413 100644
--- a/nutrinoweb/controllers/database_manager.py
+++ b/nutrinoweb/controllers/database_manager.py
@@ -51,6 +51,9 @@ app.config.from_envvar('NUTRINOWEB_SETTINGS', silent=True)
 def connect_db(database):
     """Returns a new connection to the database."""
     try:
+        print DATABASE1
+        print DATABASE2
+        print DATABASE3
         if database == 'nutrition':
             return sqlite3.connect(DATABASE1)
         elif database == 'activity':
diff --git a/run.py b/run.py
index cce0c65..3709078 100644
--- a/run.py
+++ b/run.py
@@ -6,7 +6,7 @@ try:
     from sugar.activity import activity
     BUNDLE = activity.get_bundle_path()
 except Exception, e:
-    BUNDLE = '.'
+    BUNDLE = os.path.dirname(__file__)
 
 # add lib path to current python path
 sys.path.append(os.path.join(BUNDLE, 'lib'))