Merge pull request #137 from saumilpatel/master

Trigger DJ setup from Connection instantiation

Author: eywalker

+dj/Connection.m

@@ -26,6 +26,7 @@
             % specify the connection to the database.
             % initQuery is the SQL query to be executed at the start
             % of each new session.
+            setupDJ(true);
             try
                 mymVersion = mym('version');
                 assert(mymVersion.major > 2 || mymVersion.major==2 && mymVersion.minor>=6)
@@ -151,7 +152,7 @@ function reload(self)
                     error 'Server disconnected during a transaction'
                 end
             end
-        end
+       end
 
 
         function ret = query(self, queryStr, varargin)

+dj/conn.m

@@ -20,6 +20,7 @@
 
 function connObj = conn(host, user, pass, initQuery, reset)
 persistent CONN
+
 if nargin < 5
     reset = false;
 end
@@ -29,7 +30,6 @@
         'connection already instantiated. To reconnect, clear functions')
 else
     % invoke setupDJ
-    setupDJ(true);
     % optional environment variables specifying the connection.
     env  = struct(...
         'host', 'DJ_HOST', ...

setupDJ.m

@@ -1,11 +1,22 @@
-function setupDJ(skip)
+function setupDJ(skipPathAddition, force)
+
+    if nargin < 2
+        force = false;
+    end
+
+    persistent INVOKED;
+    
+    if ~isempty(INVOKED) && ~force
+        return
+    end
+
     base = fileparts(mfilename('fullpath'));
 
     if nargin < 1
-        skip = false;
+        skipPathAddition = false;
     end
 
-    if ~skip
+    if ~skipPathAddition
         fprintf('Adding DataJoint to the path...\n')
         addpath(base)
     end
@@ -31,4 +42,6 @@ function setupDJ(skip)
     % run mymSetup.m
     fprintf('Setting up mym...\n')
     run(fullfile(mymdir, 'mymSetup.m'))
+    
+    INVOKED = 1;
 end